diff options
| author | YamaArashi <shadow962@live.com> | 2015-12-03 00:17:29 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-12-03 00:17:29 -0800 |
| commit | fe1076d42c9fff86866f761962739f7f4d295bf0 (patch) | |
| tree | 6a85f120f20228e7d95ead8d9dfec8fac90c32ac | |
| parent | 4339dc18fcabc452470687b1d7a5d72a8d08301f (diff) | |
update graphics function disasm
| -rw-r--r-- | asm/emerald.s | 8711 | ||||
| -rw-r--r-- | asm/gpu_bg.s | 124 | ||||
| -rw-r--r-- | asm/gpu_obj.s | 693 | ||||
| -rw-r--r-- | asm/main.s | 2 | ||||
| -rw-r--r-- | asm/main_menu.s | 116 | ||||
| -rw-r--r-- | asm/window.s | 60 | ||||
| -rw-r--r-- | data/data2.s | 2 |
7 files changed, 4866 insertions, 4842 deletions
diff --git a/asm/emerald.s b/asm/emerald.s index bef0051ff..7bc2bf403 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -218,8 +218,8 @@ sub_80094EC: ; 80094EC sub_8009570: ; 8009570 push {r4,lr} sub sp, 0x4 - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator bl clear_tasks ldr r0, =sub_80096BC bl SetVBlankCallback @@ -258,8 +258,8 @@ sub_8009570: ; 8009570 movs r1, 0 bl AddTask bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably ldr r0, =0x03000d60 str r4, [r0] @@ -346,8 +346,8 @@ sub_8009638: ; 8009638 thumb_func_start sub_80096BC sub_80096BC: ; 80096BC push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -682,8 +682,8 @@ c2_08009A8C: ; 80099BC movs r2, 0 bl sub_8009818 bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r0} bx r0 @@ -3370,8 +3370,8 @@ c2_800ACD4: ; 800AF30 movs r1, 0xE0 lsls r1, 9 bl InitHeap - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator bl pal_fade_control_reset_maybe movs r0, 0 movs r1, 0 @@ -3407,7 +3407,7 @@ c2_800ACD4: ; 800AF30 adds r1, r0, 0 str r1, [r4] movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r0, =gUnknown_082ED204 bl InitWindows lsls r0, 16 @@ -3452,8 +3452,8 @@ c2_800ACD4: ; 800AF30 movs r0, 0 str r0, [r1] bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably ldr r0, =sub_800B1A0 bl SetMainCallback2 @@ -3484,9 +3484,9 @@ sub_800B080: ; 800B080 movs r0, 0x1 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, =gUnknown_082EC86C movs r1, 0 movs r2, 0x20 @@ -3517,9 +3517,9 @@ sub_800B080: ; 800B080 movs r3, 0x1 bl box_print movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x2 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 movs r1, 0 bl CopyWindowToVram @@ -3560,9 +3560,9 @@ sub_800B138: ; 800B138 movs r3, 0 bl box_print movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x2 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x1 movs r1, 0 bl CopyWindowToVram @@ -9454,7 +9454,7 @@ sub_800DFB4: ; 800DFB4 ldr r0, =gUnknown_082ED5F0 adds r1, r3, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 @@ -9467,7 +9467,7 @@ sub_800DFB4: ; 800DFB4 strh r0, [r4, 0x3C] ldr r0, =gUnknown_082ED5E0 ldrh r0, [r0, 0x6] - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag strh r0, [r4, 0x3A] adds r4, 0x3E ldrb r0, [r4] @@ -9482,7 +9482,7 @@ sub_800DFB4: ; 800DFB4 ldr r0, =gUnknown_082ED5F0 adds r1, r3, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r4, =0x02022b10 strb r0, [r4] ldr r5, =0x02020630 @@ -9495,7 +9495,7 @@ sub_800DFB4: ; 800DFB4 strh r1, [r0, 0x3C] ldr r0, =gUnknown_082ED5E0 ldrh r0, [r0, 0x6] - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag ldrb r2, [r4] lsls r1, r2, 4 adds r1, r2 @@ -9541,7 +9541,7 @@ sub_800E084: ; 800E084 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r3, =0x030022c0 movs r0, 0x84 lsls r0, 3 @@ -9566,16 +9566,16 @@ sub_800E0E8: ; 800E0E8 push {r4,lr} ldr r4, =gUnknown_082ED5E0 ldrh r0, [r4, 0x6] - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 bne @0800E100 adds r0, r4, 0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic @0800E100: ldr r0, =gUnknown_082ED5E8 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette ldr r1, =0x02022b10 movs r0, 0xFF strb r0, [r1] @@ -16606,8 +16606,8 @@ sub_8011AC8: ; 8011AC8 thumb_func_start sub_8011AE8 sub_8011AE8: ; 8011AE8 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -16616,8 +16616,8 @@ sub_8011AE8: ; 8011AE8 thumb_func_start sub_8011AFC sub_8011AFC: ; 8011AFC push {r4,lr} - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator bl clear_tasks bl sub_80A1A74 ldr r0, =sub_8011AE8 @@ -16651,8 +16651,8 @@ sub_8011AFC: ; 8011AFC movs r0, 0 bl SetGpuReg bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably bl sub_8011BA4 ldr r0, =sub_8011BF8 @@ -16721,8 +16721,8 @@ sub_8011BD0: ; 8011BD0 sub_8011BF8: ; 8011BF8 push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r0} bx r0 @@ -18254,7 +18254,7 @@ sub_8012780: ; 8012780 movs r3, 0x8 bl sub_80173E0 ldrb r0, [r6, 0x10] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r6, 0x10] movs r1, 0x2 bl CopyWindowToVram @@ -18278,12 +18278,12 @@ sub_8012780: ; 8012780 movs r1, 0 bl sub_81973FC ldrb r0, [r6, 0x11] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r6, 0x11] movs r1, 0x2 bl CopyWindowToVram movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram mov r5, r8 strb r5, [r6, 0x13] strb r4, [r6, 0xC] @@ -18964,7 +18964,7 @@ sub_8012F64: ; 8012F64 push {r4,lr} adds r4, r0, 0 ldrb r0, [r4, 0x11] - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r4, 0x11] movs r1, 0 bl sub_819746C @@ -18973,12 +18973,12 @@ sub_8012F64: ; 8012F64 movs r2, 0 bl sub_81AE6C8 ldrb r0, [r4, 0x10] - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r4, 0xF] movs r1, 0 bl sub_819746C movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldrb r0, [r4, 0x11] bl RemoveWindow ldrb r0, [r4, 0xF] @@ -19735,7 +19735,7 @@ sub_80134E8: ; 80134E8 movs r3, 0x8 bl sub_80173E0 ldrb r0, [r6, 0xC] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r6, 0xC] movs r1, 0x2 bl CopyWindowToVram @@ -19759,14 +19759,14 @@ sub_80134E8: ; 80134E8 movs r1, 0 bl sub_81973FC ldrb r0, [r6, 0xD] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r6, 0xD] bl sub_80125BC ldrb r0, [r6, 0xD] movs r1, 0x2 bl CopyWindowToVram movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram strb r4, [r6, 0xF] movs r0, 0x3 strb r0, [r6, 0x8] @@ -20166,7 +20166,7 @@ sub_80134E8: ; 80134E8 b @08013B82 @08013A8C: ldrb r0, [r6, 0xD] - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r6, 0xD] movs r1, 0 bl sub_819746C @@ -20175,12 +20175,12 @@ sub_80134E8: ; 80134E8 movs r2, 0 bl sub_81AE6C8 ldrb r0, [r6, 0xC] - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r6, 0xB] movs r1, 0 bl sub_819746C movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldrb r0, [r6, 0xD] bl RemoveWindow ldrb r0, [r6, 0xB] @@ -21042,8 +21042,8 @@ sub_80141A4: ; 80141A4 @080141F2: bl run_active_tasks bl RunTextPrinters - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad pop {r4} pop {r0} bx r0 @@ -21245,8 +21245,8 @@ sub_8014384: ; 8014384 @080143C6: bl run_active_tasks bl RunTextPrinters - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad pop {r4} pop {r0} bx r0 @@ -22001,7 +22001,7 @@ sub_8014A40: ; 8014A40 bl calls_per_item_funcs_in_list_outer strb r0, [r5, 0x12] movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x1 strb r0, [r5, 0x13] b @08014C42 @@ -22292,7 +22292,7 @@ sub_8014A40: ; 8014A40 movs r2, 0 bl sub_81AE6C8 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldrb r0, [r5, 0xF] bl RemoveWindow ldrb r0, [r5, 0x17] @@ -22348,7 +22348,7 @@ sub_8014A40: ; 8014A40 movs r2, 0 bl sub_81AE6C8 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldrb r0, [r5, 0xF] bl RemoveWindow ldrb r0, [r5, 0x17] @@ -22538,14 +22538,14 @@ sub_8014F48: ; 8014F48 movs r1, 0x11 bl FillWindowPixelBuffer ldrb r0, [r7, 0xD] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r7, 0xD] bl sub_80125BC ldrb r0, [r7, 0xD] movs r1, 0x2 bl CopyWindowToVram movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram strb r6, [r7, 0xF] movs r0, 0x3 strb r0, [r7, 0x8] @@ -22704,7 +22704,7 @@ sub_8014F48: ; 8014F48 movs r2, 0 bl sub_81AE6C8 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldrb r0, [r7, 0xD] bl RemoveWindow ldrb r0, [r7, 0xB] @@ -22906,7 +22906,7 @@ task00_081182DC: ; 80152F4 bl calls_per_item_funcs_in_list_outer strb r0, [r5, 0xE] movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @08015404: movs r0, 0 strb r0, [r5, 0xF] @@ -23073,7 +23073,7 @@ task00_081182DC: ; 80152F4 movs r2, 0 bl sub_81AE6C8 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldrb r0, [r5, 0xB] bl RemoveWindow @08015580: @@ -24094,7 +24094,7 @@ sub_80156E0: ; 80156E0 bl @08016878 @08015F5C: movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r4, =0x02022c2c movs r0, 0x45 strb r0, [r4] @@ -26208,7 +26208,7 @@ sub_8017118: ; 8017118 movs r1, 0x2 bl CopyWindowToVram adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0 add sp, 0x8 pop {r4} @@ -26508,9 +26508,9 @@ sub_80173B0: ; 80173B0 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0xC pop {r0} bx r0 @@ -28600,8 +28600,8 @@ sub_8018404: ; 8018404 thumb_func_start sub_8018424 sub_8018424: ; 8018424 push {lr} - bl copy_queue_process - bl copy_super_sprites_to_oam + bl ProcessObjectCopyRequests + bl LoadOamFromSprites bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -28612,8 +28612,8 @@ sub_8018438: ; 8018438 push {lr} bl run_active_tasks bl RunTextPrinters - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad pop {r0} bx r0 thumb_func_end sub_8018438 @@ -28652,8 +28652,8 @@ sub_8018450: ; 8018450 movs r0, 0 bl SetVBlankCallback bl sub_80A1A74 - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator bl clear_tasks bl remove_some_task movs r0, 0 @@ -28700,22 +28700,22 @@ sub_8018450: ; 8018450 bl Alloc adds r1, r0, 0 movs r0, 0x3 - bl SetBgTileMap + bl SetBgTilemap adds r0, r4, 0 bl Alloc adds r1, r0, 0 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap adds r0, r4, 0 bl Alloc adds r1, r0, 0 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap adds r0, r4, 0 bl Alloc adds r1, r0, 0 movs r0, 0 - bl SetBgTileMap + bl SetBgTilemap movs r0, 0x3 bl bgid_upload_textbox_1 ldr r0, =gUnknown_082F05A8 @@ -28765,7 +28765,7 @@ sub_8018450: ; 8018450 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -28773,7 +28773,7 @@ sub_8018450: ; 8018450 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -28781,7 +28781,7 @@ sub_8018450: ; 8018450 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r0, 0x3 bl sub_8018798 lsls r0, r7, 24 @@ -28792,13 +28792,13 @@ sub_8018450: ; 8018450 .pool @080185F8: movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @08018610: ldrb r0, [r6] adds r0, 0x1 @@ -28874,16 +28874,16 @@ sub_80186A4: ; 80186A4 strb r0, [r1] bl FreeAllWindowBuffers movs r0, 0 - bl GetBgTileMap + bl GetBgTilemap bl Free movs r0, 0x1 - bl GetBgTileMap + bl GetBgTilemap bl Free movs r0, 0x2 - bl GetBgTileMap + bl GetBgTilemap bl Free movs r0, 0x3 - bl GetBgTileMap + bl GetBgTilemap bl Free ldr r0, =c2_title_screen_1 bl SetMainCallback2 @@ -28950,7 +28950,7 @@ sub_80186EC: ; 80186EC movs r1, 0x2 bl CopyWindowToVram movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap add sp, 0x14 pop {r4-r7} pop {r0} @@ -28992,7 +28992,7 @@ sub_8018798: ; 8018798 movs r1, 0x3 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect mov r8, r4 movs r4, 0x1 @080187C8: @@ -29020,7 +29020,7 @@ sub_8018798: ; 8018798 lsrs r0, r1, 24 movs r1, 0x1 lsrs r3, r5, 24 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect b @08018812 @080187FC: lsrs r2, r6, 24 @@ -29032,7 +29032,7 @@ sub_8018798: ; 8018798 lsrs r0, r1, 24 movs r1, 0x2 lsrs r3, r5, 24 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect @08018812: movs r0, 0x80 lsls r0, 17 @@ -29073,7 +29073,7 @@ sub_8018838: ; 8018838 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect b @08018876 @0801885E: movs r0, 0x20 @@ -29086,10 +29086,10 @@ sub_8018838: ; 8018838 movs r1, 0 movs r2, 0 movs r3, 0x2 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect @08018876: movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0xC pop {r0} bx r0 @@ -29123,7 +29123,7 @@ sub_8018884: ; 8018884 movs r2, 0xF bl sub_8098858 movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x1 movs r1, 0x3 bl CopyWindowToVram @@ -29140,7 +29140,7 @@ sub_80188DC: ; 80188DC movs r0, 0x1 bl rbox_fill_rectangle movs r0, 0x1 - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0x1 movs r1, 0x1 bl CopyWindowToVram @@ -29407,7 +29407,7 @@ sub_8018A50: ; 8018A50 cmp r4, r0 beq @08018AFA movs r0, 0x2 - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0x2 movs r1, 0x1 bl CopyWindowToVram @@ -29479,7 +29479,7 @@ sub_8018B08: ; 8018B08 movs r1, 0x2 bl CopyWindowToVram ldrb r0, [r4] - bl PutWindowTileMap + bl PutWindowTilemap b @08018BD6 .pool @08018B98: @@ -29532,7 +29532,7 @@ sub_8018B08: ; 8018B08 ldrb r0, [r4] bl rbox_fill_rectangle ldrb r0, [r4] - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r4] movs r1, 0x1 bl CopyWindowToVram @@ -29546,7 +29546,7 @@ sub_8018B08: ; 8018B08 ldrb r0, [r4] bl rbox_fill_rectangle ldrb r0, [r4] - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r4] movs r1, 0x1 bl CopyWindowToVram @@ -29625,7 +29625,7 @@ sub_8018C4C: ; 8018C4C movs r1, 0x2 bl CopyWindowToVram ldrb r0, [r5] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] @@ -29671,7 +29671,7 @@ sub_8018C4C: ; 8018C4C ldrb r0, [r5] bl rbox_fill_rectangle ldrb r0, [r5] - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r5] movs r1, 0x1 bl CopyWindowToVram @@ -29686,7 +29686,7 @@ sub_8018C4C: ; 8018C4C ldrb r0, [r5] bl rbox_fill_rectangle ldrb r0, [r5] - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r5] movs r1, 0x1 bl CopyWindowToVram @@ -31925,7 +31925,7 @@ sub_8019F04: ; 8019F04 adds r0, r1 lsls r0, 2 adds r0, r6 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r4, 0x1 cmp r4, 0x27 ble @08019F0C @@ -32561,8 +32561,8 @@ sub_801A3F4: ; 801A3F4 bne @0801A414 bl run_active_tasks bl RunTextPrinters - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably @0801A414: pop {r0} @@ -32572,8 +32572,8 @@ sub_801A3F4: ; 801A3F4 thumb_func_start sub_801A418 sub_801A418: ; 801A418 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -32614,12 +32614,12 @@ sub_801A43C: ; 801A43C bl Alloc adds r1, r0, 0 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap adds r0, r4, 0 bl Alloc adds r1, r0, 0 movs r0, 0 - bl SetBgTileMap + bl SetBgTilemap ldr r1, =gUnknown_082F0990 movs r0, 0 str r0, [sp] @@ -32631,12 +32631,12 @@ sub_801A43C: ; 801A43C movs r0, 0x1 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer ldr r0, =gUnknown_082F0D3C bl InitWindows bl DeactivateAllTextPrinters bl sub_80A1A74 - bl reset_all_obj_data + bl ResetAllObjectData bl clear_tasks bl remove_some_task bl SoundVSyncOn_rev01 @@ -32687,15 +32687,15 @@ sub_801A43C: ; 801A43C movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, =sub_801A3F4 bl SetMainCallback2 bl run_active_tasks bl RunTextPrinters - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably add sp, 0xC pop {r4,r5} @@ -32712,7 +32712,7 @@ sub_801A584: ; 801A584 @0801A58C: lsls r0, r4, 24 lsrs r0, 24 - bl GetBgTileMap + bl GetBgTilemap bl Free adds r4, 0x1 cmp r4, 0x1 @@ -32838,12 +32838,12 @@ sub_801A600: ; 801A600 movs r3, 0 bl sub_801A8B0 movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 movs r1, 0x2 bl CopyWindowToVram movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x1 movs r1, 0x2 bl CopyWindowToVram @@ -32911,7 +32911,7 @@ sub_801A6C0: ; 801A6C0 movs r0, 0x1 bl ShowBg movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0 bl ShowBg b @0801A86C @@ -32992,7 +32992,7 @@ sub_801A6C0: ; 801A6C0 cmp r4, 0x3 ble @0801A796 movs r0, 0x2 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x2 movs r1, 0x3 bl CopyWindowToVram @@ -33527,7 +33527,7 @@ sub_801ABDC: ; 801ABDC movs r3, 0x1 bl sub_801AB68 movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 movs r1, 0x3 bl CopyWindowToVram @@ -33557,8 +33557,8 @@ sub_801ABDC: ; 801ABDC thumb_func_start sub_801AC40 sub_801AC40: ; 801AC40 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -33646,8 +33646,8 @@ sub_801AC54: ; 801AC54 movs r0, 0x4 bl AllocZeroed str r0, [r4] - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator bl clear_tasks movs r0, 0 bl ResetBgsAndClearDma3BusyFlags @@ -33665,7 +33665,7 @@ sub_801AC54: ; 801AC54 @0801AD8C: bl DeactivateAllTextPrinters movs r0, 0 - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0 movs r1, 0 bl FillWindowPixelBuffer @@ -33682,7 +33682,7 @@ sub_801AC54: ; 801AC54 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r0, 0 movs r1, 0x1 movs r2, 0xD0 @@ -33886,8 +33886,8 @@ sub_801AC54: ; 801AC54 @0801AFAE: bl run_active_tasks bl RunTextPrinters - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably @0801AFC2: add sp, 0xC @@ -35475,27 +35475,27 @@ sub_801BB74: ; 801BB74 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r5, [sp] str r4, [sp, 0x4] movs r0, 0x1 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r5, [sp] str r4, [sp, 0x4] movs r0, 0x2 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r5, =0x02022c74 ldr r0, [r5] movs r1, 0xB8 @@ -35588,9 +35588,9 @@ sub_801BB74: ; 801BB74 movs r0, 0x2 movs r2, 0 movs r3, 0 - bl CopyRectToBgTileMapBufferRect + bl CopyRectToBgTilemapBufferRect movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @0801BD86 .pool @0801BD14: @@ -35604,7 +35604,7 @@ sub_801BB74: ; 801BB74 movs r0, 0x2 bl sub_801C178 movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @0801BD86 @0801BD34: bl sub_80D2F04 @@ -35720,27 +35720,27 @@ sub_801BDA4: ; 801BDA4 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r5, [sp] str r4, [sp, 0x4] movs r0, 0x1 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r5, [sp] str r4, [sp, 0x4] movs r0, 0x2 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @0801BEDA @0801BE56: movs r0, 0x1 @@ -35778,7 +35778,7 @@ sub_801BDA4: ; 801BDA4 adds r1, r2, 0 bl sub_80186EC movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -36149,7 +36149,7 @@ sub_801C178: ; 801C178 lsls r6, r0, 24 lsrs r5, r6, 24 adds r0, r5, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r5, 0 movs r1, 0 bl FillWindowPixelBuffer @@ -36588,7 +36588,7 @@ sub_801C4C0: ; 801C4C0 cmp r0, 0x1 bne @0801C5EE ldr r0, =gUnknown_082F1D00 - bl gpu_tile_obj_decompress_and_load3 + bl LoadCompressedObjectPicUsingHeap ldr r0, [r4] movs r2, 0xB8 lsls r2, 1 @@ -36599,7 +36599,7 @@ sub_801C4C0: ; 801C4C0 lsls r0, 3 ldr r1, =gUnknown_082F1D08 adds r0, r1 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette ldr r0, [r4] ldrb r0, [r0, 0x9] cmp r7, r0 @@ -36635,7 +36635,7 @@ sub_801C4C0: ; 801C4C0 adds r1, r5, 0 movs r2, 0x90 movs r3, 0x8 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r6] add r1, r10 adds r1, r4 @@ -36731,7 +36731,7 @@ sub_801C61C: ; 801C61C adds r0, r1 lsls r0, 2 adds r0, r7 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0801C678: ldr r0, [r6] movs r2, 0xBF @@ -36759,9 +36759,9 @@ sub_801C61C: ; 801C61C movs r4, 0x80 lsls r4, 8 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag @0801C6B4: pop {r4-r7} pop {r0} @@ -36938,36 +36938,36 @@ sub_801C758: ; 801C758 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r5, [sp] str r4, [sp, 0x4] movs r0, 0x1 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r5, [sp] str r4, [sp, 0x4] movs r0, 0x2 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r5, [sp] str r4, [sp, 0x4] movs r0, 0x3 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r5, =0x02022c78 ldr r0, [r5] movs r1, 0xDE @@ -37057,7 +37057,7 @@ sub_801C758: ; 801C758 str r7, [sp, 0x20] movs r2, 0 movs r3, 0 - bl CopyRectToBgTileMapBufferRect + bl CopyRectToBgTilemapBufferRect mov r3, r8 ldr r1, [r3] adds r1, r6 @@ -37076,11 +37076,11 @@ sub_801C758: ; 801C758 movs r0, 0x3 movs r2, 0 movs r3, 0x3 - bl CopyRectToBgTileMapBufferRect + bl CopyRectToBgTilemapBufferRect movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @0801CA1E .pool @0801C990: @@ -37089,9 +37089,9 @@ sub_801C758: ; 801C758 @0801C996: bl sub_801CE7C movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @0801CA1E @0801C9A8: movs r0, 0x1 @@ -37252,14 +37252,14 @@ sub_801CA50: ; 801CA50 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r4, [sp] str r5, [sp, 0x4] movs r0, 0x1 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r4, [sp] movs r5, 0x18 str r5, [sp, 0x4] @@ -37267,22 +37267,22 @@ sub_801CA50: ; 801CA50 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r4, [sp] str r5, [sp, 0x4] movs r0, 0x3 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @0801CC0E @0801CB54: movs r0, 0x1 @@ -37336,9 +37336,9 @@ sub_801CA50: ; 801CA50 movs r0, 0x3 bl sub_8018798 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -37693,13 +37693,13 @@ sub_801CE7C: ; 801CE7C lsls r7, 1 adds r0, r7 ldrb r0, [r0] - bl PutWindowTileMap + bl PutWindowTilemap ldr r0, [r6] movs r4, 0xE5 lsls r4, 1 adds r0, r4 ldrb r0, [r0] - bl PutWindowTileMap + bl PutWindowTilemap ldr r0, [r6] adds r0, r7 ldrb r0, [r0] @@ -39786,8 +39786,8 @@ c2_081284E0: ; 801DE54 b @0801DF04 @0801DE7A: bl clear_tasks - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator bl sub_801F4D0 b @0801DEBC @0801DE8C: @@ -39853,8 +39853,8 @@ c2_081284E0: ; 801DE54 sub_801DF20: ; 801DF20 push {lr} bl copy_pal_bg_faded_to_pal_ram - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl sub_80BA0A8 pop {r0} bx r0 @@ -39865,8 +39865,8 @@ sub_801DF38: ; 801DF38 push {lr} bl run_active_tasks bl sub_801F5B8 - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r0} bx r0 @@ -42978,7 +42978,7 @@ sub_801F82C: ; 801F82C bl sub_8020094 bl sub_801FEBC movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @0801F862 @0801F84C: bl IsDma3ManagerBusyWithBgCopy @@ -43769,7 +43769,7 @@ sub_801FDDC: ; 801FDDC bl FillWindowPixelBuffer ldr r0, [r5] ldrb r0, [r0, 0x18] - bl PutWindowTileMap + bl PutWindowTilemap ldr r0, [r5] ldrb r0, [r0, 0x18] ldr r2, =gUnknown_085EAE62 @@ -43822,7 +43822,7 @@ sub_801FEBC: ; 801FEBC bl sub_8198070 ldr r0, [r4] ldrb r0, [r0, 0x18] - bl ClearWindowTileMap + bl ClearWindowTilemap @0801FEDA: pop {r4} pop {r0} @@ -43964,7 +43964,7 @@ sub_801FF18: ; 801FF18 movs r1, 0x11 bl FillWindowPixelBuffer adds r0, r5, 0 - bl PutWindowTileMap + bl PutWindowTilemap ldr r1, =gUnknown_082F2D40 lsls r0, r7, 1 adds r0, r7 @@ -44050,7 +44050,7 @@ sub_8020094: ; 8020094 bl sub_8198070 ldr r0, [r4] ldrb r0, [r0, 0x1E] - bl ClearWindowTileMap + bl ClearWindowTilemap @080200B2: movs r0, 0 movs r1, 0 @@ -44477,7 +44477,7 @@ sub_80203B0: ; 80203B0 movs r3, 0x1 bl sub_81983AC movs r0, 0x3 - bl PutWindowTileMap + bl PutWindowTilemap add sp, 0xC pop {r4,r5} pop {r0} @@ -44492,7 +44492,7 @@ sub_802040C: ; 802040C movs r1, 0 bl sub_8198070 movs r0, 0x3 - bl ClearWindowTileMap + bl ClearWindowTilemap pop {r0} bx r0 thumb_func_end sub_802040C @@ -44630,22 +44630,22 @@ sub_8020538: ; 8020538 lsls r0, 1 adds r1, r0 movs r0, 0 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x00000928 adds r1, r0 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x00001128 adds r1, r0 movs r0, 0x3 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x00001928 adds r1, r0 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap pop {r4} pop {r0} bx r0 @@ -44669,9 +44669,9 @@ sub_8020584: ; 8020584 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0x8 pop {r0} bx r0 @@ -44700,9 +44700,9 @@ sub_80205B4: ; 80205B4 movs r0, 0x1 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0x4 pop {r0} bx r0 @@ -44749,9 +44749,9 @@ task_tutorial_story_unknown: ; 8020604 movs r0, 0x2 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0x4 pop {r4,r5} pop {r0} @@ -44784,7 +44784,7 @@ sub_80206A4: ; 80206A4 movs r2, 0x20 bl gpu_pal_apply movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer @@ -44800,7 +44800,7 @@ sub_80206A4: ; 80206A4 sub_80206D0: ; 80206D0 push {lr} movs r0, 0x2 - bl PutWindowTileMap + bl PutWindowTilemap bl sub_80201A4 movs r0, 0x2 movs r1, 0x3 @@ -44840,7 +44840,7 @@ sub_80206E8: ; 80206E8 movs r1, 0 bl FillWindowPixelBuffer movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x1 movs r1, 0x3 bl CopyWindowToVram @@ -45007,13 +45007,13 @@ sub_8020890: ; 8020890 ldr r4, =gUnknown_082F3134 @08020896: adds r0, r4, 0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic adds r4, 0x8 adds r5, 0x1 cmp r5, 0x4 bls @08020896 ldr r0, =gUnknown_082F315C - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette ldr r4, =0x02022c8c movs r0, 0x18 bl Alloc @@ -45052,7 +45052,7 @@ sub_80208E8: ; 80208E8 movs r1, 0xA movs r2, 0x18 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r1, =0x02022c8c @@ -45106,7 +45106,7 @@ sub_802093C: ; 802093C ldr r0, [r4] ldr r0, [r0] movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r1, [r4] ldr r2, [r1] mov r0, sp @@ -45122,7 +45122,7 @@ sub_802093C: ; 802093C ldr r0, [r4] ldr r0, [r0] movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r2, [r4] ldr r1, [r2] movs r0, 0x18 @@ -45150,7 +45150,7 @@ sub_80209AC: ; 80209AC ldr r0, =gUnknown_082F2DF2 adds r4, r0 movs r0, 0 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag adds r1, r0, 0 lsls r1, 24 lsrs r1, 4 @@ -45178,7 +45178,7 @@ sub_80209E0: ; 80209E0 ldr r0, [r0] ldr r0, [r0] movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim b @08020A0C .pool @08020A00: @@ -45186,7 +45186,7 @@ sub_80209E0: ; 80209E0 ldr r0, [r0] ldr r0, [r0] movs r1, 0x3 - bl obj_anim_image_start + bl StartObjectImageAnim @08020A0C: ldr r0, =0x02022c8c ldr r1, [r0] @@ -45224,13 +45224,13 @@ sub_8020A1C: ; 8020A1C ldr r0, [r4] ldr r0, [r0] movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim b @08020A28 @08020A54: ldr r0, [r4] ldr r0, [r0] movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim b @08020A28 @08020A60: movs r0, 0x1 @@ -45247,7 +45247,7 @@ sub_8020A68: ; 8020A68 movs r1, 0x4C movs r2, 0x98 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r5, =0x02022c8c @@ -45262,7 +45262,7 @@ sub_8020A68: ; 8020A68 movs r1, 0x40 movs r2, 0x98 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r2, [r5] @@ -45342,7 +45342,7 @@ sub_8020B20: ; 8020B20 movs r1, 0x8 movs r2, 0x98 movs r3, 0x3 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r5, =0x02022c8c @@ -45357,7 +45357,7 @@ sub_8020B20: ; 8020B20 movs r1, 0x20 movs r2, 0x98 movs r3, 0x4 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r2, [r5] @@ -45400,7 +45400,7 @@ sub_8020B80: ; 8020B80 ldr r0, [r3] ldr r0, [r0, 0x10] movs r1, 0x3 - bl obj_anim_image_start + bl StartObjectImageAnim b @08020BF6 .pool @08020BB8: @@ -45433,7 +45433,7 @@ sub_8020B80: ; 8020B80 ldr r0, [r0, 0x10] lsls r1, r4, 24 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim @08020BF6: pop {r4} pop {r0} @@ -45861,8 +45861,8 @@ sub_8020E58: ; 8020E58 sub_8020F74: ; 8020F74 push {lr} bl copy_pal_bg_faded_to_pal_ram - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests pop {r0} bx r0 thumb_func_end sub_8020F74 @@ -45872,8 +45872,8 @@ sub_8020F88: ; 8020F88 push {lr} bl run_active_tasks bl RunTextPrinters - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad pop {r0} bx r0 thumb_func_end sub_8020F88 @@ -46036,8 +46036,8 @@ sub_802104C: ; 802104C .pool @080210E4: bl sub_80A1A74 - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator b @080212FC @080210F2: movs r0, 0 @@ -46050,17 +46050,17 @@ sub_802104C: ; 802104C lsls r0, 1 adds r1, r5, r0 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap movs r0, 0x87 lsls r0, 6 adds r1, r5, r0 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap movs r0, 0xC7 lsls r0, 6 adds r1, r5, r0 movs r0, 0x3 - bl SetBgTileMap + bl SetBgTilemap movs r0, 0 movs r1, 0 movs r2, 0 @@ -46101,7 +46101,7 @@ sub_802104C: ; 802104C movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r4, [sp] movs r0, 0x40 str r0, [sp, 0x4] @@ -46109,31 +46109,31 @@ sub_802104C: ; 802104C movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r4, [sp] str r4, [sp, 0x4] movs r0, 0x2 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r4, [sp] str r4, [sp, 0x4] movs r0, 0x3 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 b @080212FC @080211BE: movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r1, =gUnknown_08DE34B8 movs r0, 0 str r0, [sp] @@ -46173,25 +46173,25 @@ sub_802104C: ; 802104C movs r0, 0x1 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer ldr r1, =gUnknown_082F3DBC movs r0, 0x2 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer ldr r1, =gUnknown_082F3F54 movs r0, 0x3 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer adds r0, r5, 0 bl sub_80226D0 movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @080212FC .pool @08021278: @@ -46325,55 +46325,55 @@ sub_802130C: ; 802130C movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r4, [sp] str r4, [sp, 0x4] movs r0, 0x1 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r4, [sp] str r4, [sp, 0x4] movs r0, 0x2 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r4, [sp] str r4, [sp, 0x4] movs r0, 0x3 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @0802143E @080213E6: bl FreeAllWindowBuffers movs r0, 0 bl HideBg movs r0, 0 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0x1 bl HideBg movs r0, 0x1 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0x2 bl HideBg movs r0, 0x2 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0x3 bl HideBg movs r0, 0x3 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r1, 0x82 lsls r1, 5 movs r0, 0 @@ -46688,7 +46688,7 @@ sub_8021608: ; 8021608 adds r0, r5, 0 bl obj_free_rotscale_entry adds r0, r5, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0802169A: pop {r4-r6} pop {r0} @@ -46710,9 +46710,9 @@ sub_80216A8: ; 80216A8 adds r0, r7 ldrh r4, [r0] adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -46776,7 +46776,7 @@ sub_80216E0: ; 80216E0 adds r0, r5, r4 ldr r0, [r0] movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim b @0802175A .pool @08021748: @@ -46787,7 +46787,7 @@ sub_80216E0: ; 80216E0 adds r0, r5, r4 ldr r0, [r0] movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @0802175A: adds r3, r5, r4 ldr r2, [r3] @@ -46912,13 +46912,13 @@ sub_80216E0: ; 80216E0 beq @08021860 ldr r0, [r7] movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim b @08021868 .pool @08021860: ldr r0, [r7] movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @08021868: mov r0, r8 adds r0, 0x1 @@ -47938,7 +47938,7 @@ sub_8022070: ; 8022070 adds r4, r6, 0 adds r4, 0x82 ldrb r0, [r4] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r4] movs r1, 0 bl FillWindowPixelBuffer @@ -48141,7 +48141,7 @@ sub_8022250: ; 8022250 strh r0, [r6, 0x2] lsls r0, 24 lsrs r0, 24 - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r6, 0x2] movs r1, 0 bl FillWindowPixelBuffer @@ -48352,7 +48352,7 @@ sub_8022250: ; 8022250 movs r1, 0x1 bl sub_8198070 ldrb r0, [r6, 0x2] - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r6, 0x2] bl RemoveWindow adds r0, r4, 0 @@ -48504,7 +48504,7 @@ sub_8022588: ; 8022588 adds r4, r6 strb r0, [r4] ldrb r0, [r4] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r4] movs r1, 0 bl FillWindowPixelBuffer @@ -48539,7 +48539,7 @@ sub_8022600: ; 8022600 adds r0, r6, r1 adds r5, r0, r7 ldrb r0, [r5] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r6, 0x8] cmp r7, r0 bne @08022668 @@ -48609,7 +48609,7 @@ sub_8022600: ; 8022600 bcc @08022616 @080226B6: movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0x14 pop {r3} mov r8, r3 @@ -48650,7 +48650,7 @@ sub_80226D0: ; 80226D0 movs r0, 0x2 str r0, [sp, 0x4] movs r0, 0x3 - bl CopyToBgTileMapBufferRect + bl CopyToBgTilemapBufferRect adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -48659,7 +48659,7 @@ sub_80226D0: ; 80226D0 cmp r5, r0 bcc @080226EC movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0x8 pop {r4-r6} pop {r0} @@ -48682,19 +48682,19 @@ sub_8022730: ; 8022730 @08022746: lsls r0, r5, 3 adds r0, r4 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 bls @08022746 ldr r0, =gUnknown_082F421C - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes ldr r0, =gUnknown_082F430C movs r1, 0x78 movs r2, 0x58 movs r3, 0x5 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 movs r0, 0xAC @@ -48744,7 +48744,7 @@ sub_8022730: ; 8022730 asrs r2, 16 ldr r0, =gUnknown_082F4324 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 movs r0, 0xAE @@ -48804,7 +48804,7 @@ sub_8022730: ; 8022730 adds r2, 0x88 ldr r0, =gUnknown_082F433C movs r3, 0x6 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 lsls r0, r5, 2 @@ -48853,7 +48853,7 @@ sub_8022730: ; 8022730 ldr r0, =gUnknown_082F4354 movs r2, 0x8 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 lsls r0, r5, 2 @@ -48928,19 +48928,19 @@ sub_8022960: ; 8022960 adds r5, r0, 0 movs r4, 0 movs r0, 0x4 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0x3 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0x2 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0x1 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0x4 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag movs r0, 0x2 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag movs r0, 0x1 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag movs r0, 0xD8 lsls r0, 1 adds r6, r5, r0 @@ -48948,7 +48948,7 @@ sub_8022960: ; 8022960 lsls r0, r4, 2 adds r0, r6, r0 ldr r0, [r0] - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -48968,7 +48968,7 @@ sub_8022960: ; 8022960 lsls r0, r4, 2 adds r0, r6, r0 ldr r0, [r0] - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -48985,7 +48985,7 @@ sub_8022960: ; 8022960 adds r0, r5, r2 adds r0, r1 ldr r0, [r0] - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -49005,7 +49005,7 @@ sub_8022960: ; 8022960 cmp r0, 0 beq @08022A18 adds r0, r2, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08022A18: pop {r4-r6} pop {r0} @@ -51900,7 +51900,7 @@ sub_8024048: ; 8024048 b @0802412A @0802408A: movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x9C lsls r0, 1 adds r1, r5, r0 @@ -52995,7 +52995,7 @@ sub_80248B0: ; 80248B0 movs r1, 0 bl FillWindowPixelBuffer ldrb r0, [r4] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r4] ldr r5, =0x0000021d adds r1, r5, 0 @@ -53020,7 +53020,7 @@ sub_8024918: ; 8024918 push {r4,lr} ldr r4, =0x02022c94 ldrb r0, [r4] - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r4] movs r1, 0x1 bl sub_8198070 @@ -53119,8 +53119,8 @@ sub_802493C: ; 802493C sub_8024A1C: ; 8024A1C push {lr} bl clear_tasks - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator pop {r0} bx r0 thumb_func_end sub_8024A1C @@ -55998,8 +55998,8 @@ sub_8026044: ; 8026044 sub_80261CC: ; 80261CC push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r0} bx r0 @@ -56009,8 +56009,8 @@ sub_80261CC: ; 80261CC sub_80261E4: ; 80261E4 push {lr} bl copy_pal_bg_faded_to_pal_ram - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests pop {r0} bx r0 thumb_func_end sub_80261E4 @@ -59514,7 +59514,7 @@ sub_8027BEC: ; 8027BEC cmp r6, 0x2 ble @08027C76 adds r0, r7, 0 - bl PutWindowTileMap + bl PutWindowTilemap add sp, 0x20 pop {r3-r5} mov r8, r3 @@ -60418,14 +60418,14 @@ sub_80283A8: ; 80283A8 str r4, [sp] str r5, [sp, 0x4] mov r0, sp - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic adds r0, r4, 0 bl Free @080283E8: add r0, sp, 0x8 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette add r0, sp, 0x10 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette add sp, 0x18 pop {r4,r5} pop {r0} @@ -60485,7 +60485,7 @@ sub_8028408: ; 8028408 mov r0, sp movs r2, 0x88 movs r3, 0x3 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r4] lsls r0, 24 lsrs r0, 24 @@ -60715,7 +60715,7 @@ sub_8028614: ; 8028614 adds r0, r1 cmp r0, 0 beq @0802863C - bl obj_delete_and_free_resources + bl RemoveObjectAndFreeResources @0802863C: adds r0, r4, 0x1 lsls r0, 24 @@ -60799,7 +60799,7 @@ sub_80286B4: ; 80286B4 lsls r0, 2 ldr r2, =0x02020630 adds r0, r2 - bl obj_anim_image_start + bl StartObjectImageAnim pop {r0} bx r0 .pool @@ -60888,9 +60888,9 @@ sub_8028734: ; 8028734 bl AllocZeroed str r0, [r4] adds r0, r5, 0 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic add r0, sp, 0x20 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette movs r4, 0 @0802878A: lsls r1, r4, 20 @@ -60907,7 +60907,7 @@ sub_8028734: ; 8028734 asrs r2, 16 mov r0, sp movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, =0x02022cf4 ldr r1, [r1] lsls r2, r4, 1 @@ -60949,7 +60949,7 @@ sub_80287E4: ; 80287E4 adds r0, r1 cmp r0, 0 beq @08028806 - bl obj_delete_and_free_resources + bl RemoveObjectAndFreeResources @08028806: adds r0, r4, 0x1 lsls r0, 24 @@ -61077,7 +61077,7 @@ sub_80288D4: ; 80288D4 ldr r1, =0x02020630 adds r0, r1 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -61124,7 +61124,7 @@ sub_80288D4: ; 80288D4 lsls r0, 2 adds r0, r6 movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim b @0802899E @0802896A: lsls r1, r4, 1 @@ -61137,7 +61137,7 @@ sub_80288D4: ; 80288D4 lsls r0, 2 adds r0, r6 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim b @0802899E @08028984: ldr r0, =0x02022cf4 @@ -61151,7 +61151,7 @@ sub_80288D4: ; 80288D4 lsls r0, 2 adds r0, r6 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @0802899E: adds r0, r4, 0x1 lsls r0, 24 @@ -61175,7 +61175,7 @@ sub_80288D4: ; 80288D4 ldr r1, =0x02020630 adds r0, r1 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -61254,10 +61254,10 @@ sub_8028A34: ; 8028A34 orrs r0, r5 str r0, [sp, 0x4] mov r0, sp - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic @08028A6A: add r0, sp, 0x8 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette adds r0, r4, 0 bl Free add sp, 0x10 @@ -61302,7 +61302,7 @@ sub_8028A88: ; 8028A88 mov r0, sp movs r2, 0x8 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r4] lsls r0, 24 lsrs r0, 24 @@ -61334,7 +61334,7 @@ sub_8028A88: ; 8028A88 mov r0, r9 movs r2, 0x31 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7, 0xC] b @08028B40 .pool @@ -61346,7 +61346,7 @@ sub_8028A88: ; 8028A88 mov r0, r9 movs r2, 0x34 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r4] @08028B40: lsls r0, 24 @@ -61361,7 +61361,7 @@ sub_8028A88: ; 8028A88 ldr r1, =0x02020630 adds r0, r1 adds r1, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -61396,7 +61396,7 @@ sub_8028B80: ; 8028B80 adds r0, r1 cmp r0, 0 beq @08028BA0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08028BA0: ldr r0, [r4] bl Free @@ -61421,7 +61421,7 @@ sub_8028B80: ; 8028B80 adds r0, r1 cmp r0, 0 beq @08028BD2 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08028BD2: ldr r0, [r4] bl Free @@ -61542,7 +61542,7 @@ sub_8028CA4: ; 8028CA4 lsls r0, 2 ldr r2, =0x02020630 adds r0, r2 - bl obj_anim_image_start + bl StartObjectImageAnim pop {r0} bx r0 .pool @@ -61646,9 +61646,9 @@ sub_8028D44: ; 8028D44 stm r2!, {r3-r5} ldm r1!, {r3-r5} stm r2!, {r3-r5} - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic add r0, sp, 0x20 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette movs r5, 0 ldr r7, =gUnknown_082FB356 adds r0, r7, 0x2 @@ -61670,7 +61670,7 @@ sub_8028D44: ; 8028D44 ldrsh r2, [r2, r0] mov r0, sp movs r3, 0x4 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r4] lsls r0, 24 lsrs r0, 24 @@ -61779,7 +61779,7 @@ sub_8028E84: ; 8028E84 adds r0, r1 cmp r0, 0 beq @08028EA4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08028EA4: ldr r0, [r4] bl Free @@ -62046,7 +62046,7 @@ sub_8029074: ; 8029074 str r6, [sp, 0x8] movs r0, 0 movs r1, 0x1 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldrb r2, [r4, 0x1] ldrb r3, [r4, 0x2] subs r3, 0x1 @@ -62058,7 +62058,7 @@ sub_8029074: ; 8029074 str r6, [sp, 0x8] movs r0, 0 movs r1, 0x2 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldrb r2, [r4, 0x3] ldrb r0, [r4, 0x1] adds r2, r0 @@ -62073,7 +62073,7 @@ sub_8029074: ; 8029074 str r6, [sp, 0x8] movs r0, 0 movs r1, 0x3 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldrb r2, [r4, 0x1] subs r2, 0x1 lsls r2, 24 @@ -62085,7 +62085,7 @@ sub_8029074: ; 8029074 str r6, [sp, 0x8] movs r0, 0 movs r1, 0x4 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldrb r2, [r4, 0x3] ldrb r0, [r4, 0x1] adds r2, r0 @@ -62098,7 +62098,7 @@ sub_8029074: ; 8029074 str r6, [sp, 0x8] movs r0, 0 movs r1, 0x6 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldrb r2, [r4, 0x1] subs r2, 0x1 lsls r2, 24 @@ -62113,7 +62113,7 @@ sub_8029074: ; 8029074 str r6, [sp, 0x8] movs r0, 0 movs r1, 0x7 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldrb r2, [r4, 0x1] ldrb r3, [r4, 0x4] ldrb r0, [r4, 0x2] @@ -62126,7 +62126,7 @@ sub_8029074: ; 8029074 str r6, [sp, 0x8] movs r0, 0 movs r1, 0x8 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldrb r2, [r4, 0x3] ldrb r0, [r4, 0x1] adds r2, r0 @@ -62142,7 +62142,7 @@ sub_8029074: ; 8029074 str r6, [sp, 0x8] movs r0, 0 movs r1, 0x9 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect add sp, 0xC pop {r4-r6} pop {r0} @@ -62169,7 +62169,7 @@ sub_8029174: ; 8029174 str r6, [sp, 0x8] movs r0, 0 movs r1, 0xA - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldrb r2, [r4, 0x1] ldrb r3, [r4, 0x2] subs r3, 0x1 @@ -62181,7 +62181,7 @@ sub_8029174: ; 8029174 str r6, [sp, 0x8] movs r0, 0 movs r1, 0xB - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldrb r2, [r4, 0x3] ldrb r0, [r4, 0x1] adds r2, r0 @@ -62196,7 +62196,7 @@ sub_8029174: ; 8029174 str r6, [sp, 0x8] movs r0, 0 movs r1, 0xC - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldrb r2, [r4, 0x1] subs r2, 0x1 lsls r2, 24 @@ -62208,7 +62208,7 @@ sub_8029174: ; 8029174 str r6, [sp, 0x8] movs r0, 0 movs r1, 0xD - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldrb r2, [r4, 0x3] ldrb r0, [r4, 0x1] adds r2, r0 @@ -62221,7 +62221,7 @@ sub_8029174: ; 8029174 str r6, [sp, 0x8] movs r0, 0 movs r1, 0xF - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldrb r2, [r4, 0x1] subs r2, 0x1 lsls r2, 24 @@ -62236,7 +62236,7 @@ sub_8029174: ; 8029174 str r6, [sp, 0x8] movs r0, 0 movs r1, 0x10 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldrb r2, [r4, 0x1] ldrb r3, [r4, 0x4] ldrb r0, [r4, 0x2] @@ -62249,7 +62249,7 @@ sub_8029174: ; 8029174 str r6, [sp, 0x8] movs r0, 0 movs r1, 0x11 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldrb r2, [r4, 0x3] ldrb r0, [r4, 0x1] adds r2, r0 @@ -62265,7 +62265,7 @@ sub_8029174: ; 8029174 str r6, [sp, 0x8] movs r0, 0 movs r1, 0x12 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect add sp, 0xC pop {r4-r6} pop {r0} @@ -62408,23 +62408,23 @@ sub_8029338: ; 8029338 movs r0, 0x3 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer ldr r1, =gUnknown_082FAF94 movs r0, 0x1 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer ldr r1, =gUnknown_082FAD44 movs r0, 0x2 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @08029414 .pool @080293D8: @@ -62592,7 +62592,7 @@ sub_8029440: ; 8029440 add r0, r9 adds r0, r6 ldrb r0, [r0] - bl ClearWindowTileMap + bl ClearWindowTilemap mov r3, r10 ldr r0, [r3] add r0, r9 @@ -62675,7 +62675,7 @@ sub_8029440: ; 8029440 adds r0, r1 adds r0, r6 ldrb r0, [r0] - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 @@ -62683,7 +62683,7 @@ sub_8029440: ; 8029440 bcc @08029604 @0802961C: movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, =0x02022cf8 ldr r1, [r0] ldr r2, =0x00003014 @@ -62701,7 +62701,7 @@ sub_8029440: ; 8029440 adds r0, r4 adds r0, r6 ldrb r0, [r0] - bl ClearWindowTileMap + bl ClearWindowTilemap ldr r0, [r5] adds r0, r4 adds r0, r6 @@ -62721,9 +62721,9 @@ sub_8029440: ; 8029440 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, =0x02022cf8 ldr r0, [r0] movs r3, 0xC0 @@ -63049,11 +63049,11 @@ sub_802988C: ; 802988C ldr r0, [r4] add r0, r8 ldrb r0, [r0] - bl ClearWindowTileMap + bl ClearWindowTilemap ldr r0, [r4] adds r0, r5 ldrb r0, [r0] - bl ClearWindowTileMap + bl ClearWindowTilemap adds r0, r6, 0 bl sub_8029174 mov r0, r9 @@ -63281,15 +63281,15 @@ sub_802988C: ; 802988C ldr r1, =0x00003008 adds r0, r1 ldrb r0, [r0] - bl PutWindowTileMap + bl PutWindowTilemap ldr r0, [r4] ldr r2, =0x00003009 adds r0, r2 ldrb r0, [r0] - bl PutWindowTileMap + bl PutWindowTilemap @08029B90: movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0 bl sub_8028C30 ldr r0, =0x02022cf8 @@ -63399,15 +63399,15 @@ sub_802988C: ; 802988C ldr r1, =0x00003008 adds r0, r1 ldrb r0, [r0] - bl PutWindowTileMap + bl PutWindowTilemap ldr r0, [r4] ldr r2, =0x00003009 adds r0, r2 ldrb r0, [r0] - bl PutWindowTileMap + bl PutWindowTilemap @08029CC0: movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, =0x02022cf8 ldr r1, [r0] ldr r0, =0x00003014 @@ -63468,7 +63468,7 @@ sub_802988C: ; 802988C movs r1, 0 movs r2, 0 movs r3, 0x5 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 ldr r5, =0x02022cf8 ldr r0, [r5] ldr r4, =0x00003009 @@ -63484,7 +63484,7 @@ sub_802988C: ; 802988C ldr r0, [r5] adds r0, r4 ldrb r0, [r0] - bl ClearWindowTileMap + bl ClearWindowTilemap adds r0, r6, 0 bl sub_8029174 b @08029FF8 @@ -63633,15 +63633,15 @@ sub_802988C: ; 802988C ldr r1, =0x00003008 adds r0, r1 ldrb r0, [r0] - bl PutWindowTileMap + bl PutWindowTilemap ldr r0, [r4] ldr r2, =0x00003009 adds r0, r2 ldrb r0, [r0] - bl PutWindowTileMap + bl PutWindowTilemap @08029F2C: movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, =0x0000020b movs r1, 0x14 movs r2, 0xA @@ -63689,12 +63689,12 @@ sub_802988C: ; 802988C ldr r5, =0x00003008 adds r0, r1, r5 ldrb r0, [r0] - bl ClearWindowTileMap + bl ClearWindowTilemap ldr r0, [r6] ldr r4, =0x00003009 adds r0, r4 ldrb r0, [r0] - bl ClearWindowTileMap + bl ClearWindowTilemap ldr r0, [r6] adds r0, r5 ldrb r0, [r0] @@ -63711,9 +63711,9 @@ sub_802988C: ; 802988C movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, [r6] movs r1, 0xC0 lsls r1, 6 @@ -63784,12 +63784,12 @@ sub_802A010: ; 802A010 ldr r0, [r7] adds r0, r4 ldrb r0, [r0] - bl ClearWindowTileMap + bl ClearWindowTilemap ldr r0, [r7] ldr r3, =0x00003009 adds r0, r3 ldrb r0, [r0] - bl ClearWindowTileMap + bl ClearWindowTilemap mov r0, r9 bl sub_8029174 mov r0, r8 @@ -63899,15 +63899,15 @@ sub_802A010: ; 802A010 ldr r3, =0x00003008 adds r0, r3 ldrb r0, [r0] - bl PutWindowTileMap + bl PutWindowTilemap ldr r0, [r7] ldr r1, =0x00003009 adds r0, r1 ldrb r0, [r0] - bl PutWindowTileMap + bl PutWindowTilemap @0802A1B6: movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r1, [r7] ldr r2, =0x00003014 adds r1, r2 @@ -64059,12 +64059,12 @@ sub_802A010: ; 802A010 ldr r6, =0x00003008 adds r0, r6 ldrb r0, [r0] - bl ClearWindowTileMap + bl ClearWindowTilemap ldr r0, [r7] ldr r1, =0x00003009 adds r0, r1 ldrb r0, [r0] - bl ClearWindowTileMap + bl ClearWindowTilemap ldr r0, [r7] adds r0, r6 ldrb r0, [r0] @@ -64082,9 +64082,9 @@ sub_802A010: ; 802A010 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, [r7] movs r3, 0xC0 lsls r3, 6 @@ -64187,9 +64187,9 @@ sub_802A380: ; 802A380 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, =0x02022cf8 ldr r0, [r0] movs r1, 0xC0 @@ -64238,7 +64238,7 @@ sub_802A454: ; 802A454 ldr r0, [r5] adds r0, r2 ldrb r0, [r0] - bl ClearWindowTileMap + bl ClearWindowTilemap adds r0, r4, 0 bl sub_8029174 b @0802A510 @@ -64281,10 +64281,10 @@ sub_802A454: ; 802A454 ldr r1, =0x00003008 adds r0, r1 ldrb r0, [r0] - bl PutWindowTileMap + bl PutWindowTilemap @0802A50A: movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @0802A510: ldr r1, [r5] adds r1, r6 @@ -64317,7 +64317,7 @@ sub_802A534: ; 802A534 ldr r4, =0x00003008 adds r0, r4 ldrb r0, [r0] - bl ClearWindowTileMap + bl ClearWindowTilemap ldr r0, [r5] adds r0, r4 ldrb r0, [r0] @@ -64330,9 +64330,9 @@ sub_802A534: ; 802A534 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, [r5] movs r1, 0xC0 lsls r1, 6 @@ -64381,7 +64381,7 @@ sub_802A588: ; 802A588 ldr r0, [r6] adds r0, r2 ldrb r0, [r0] - bl ClearWindowTileMap + bl ClearWindowTilemap adds r0, r4, 0 bl sub_8029174 ldr r1, [r6] @@ -64441,10 +64441,10 @@ sub_802A588: ; 802A588 ldr r1, =0x00003008 adds r0, r1 ldrb r0, [r0] - bl PutWindowTileMap + bl PutWindowTilemap @0802A66E: movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r1, [r6] adds r1, r7 @0802A678: @@ -64478,7 +64478,7 @@ sub_802A588: ; 802A588 ldr r4, =0x00003008 adds r0, r4 ldrb r0, [r0] - bl ClearWindowTileMap + bl ClearWindowTilemap ldr r0, [r6] adds r0, r4 ldrb r0, [r0] @@ -64491,9 +64491,9 @@ sub_802A588: ; 802A588 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, [r6] movs r2, 0xC0 lsls r2, 6 @@ -64719,19 +64719,19 @@ sub_802A7A8: ; 802A7A8 ldr r4, =0x02022cf8 ldr r1, [r4] movs r0, 0x3 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] movs r2, 0x80 lsls r2, 5 adds r1, r2 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] movs r0, 0x80 lsls r0, 6 adds r1, r0 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap add sp, 0x8 pop {r3} mov r8, r3 @@ -65156,8 +65156,8 @@ sub_802AC2C: ; 802AC2C sub_802AC58: ; 802AC58 push {lr} bl copy_pal_bg_faded_to_pal_ram - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests pop {r0} bx r0 thumb_func_end sub_802AC58 @@ -65166,8 +65166,8 @@ sub_802AC58: ; 802AC58 sub_802AC6C: ; 802AC6C push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r0} bx r0 @@ -65220,8 +65220,8 @@ sub_802ACA0: ; 802ACA0 @0802ACE0: movs r0, 0 bl SetVBlankCallback - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator ldr r0, =sub_802BD84 movs r1, 0x5 bl sub_802BE60 @@ -68906,7 +68906,7 @@ sub_802C974: ; 802C974 ldr r5, =gUnknown_082FBE08 @0802C97C: adds r0, r5, 0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic adds r5, 0x8 adds r4, 0x1 cmp r4, 0x4 @@ -68915,16 +68915,16 @@ sub_802C974: ; 802C974 ldr r5, =gUnknown_082FBE30 @0802C98E: adds r0, r5, 0 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette adds r5, 0x8 adds r4, 0x1 cmp r4, 0x1 bls @0802C98E movs r0, 0x5 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag strb r0, [r6, 0xE] movs r0, 0x6 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag strb r0, [r6, 0xF] pop {r4-r6} pop {r0} @@ -69007,7 +69007,7 @@ sub_802C9D4: ; 802C9D4 adds r0, r1 ldr r3, [r7, 0x8] mov r1, r8 - bl sub_8034628 + bl DecompressMonPic_DetectFrontOrBack mov r3, r8 str r3, [sp, 0x18] adds r4, r6, 0 @@ -69018,7 +69018,7 @@ sub_802C9D4: ; 802C9D4 lsls r2, 4 orrs r1, r2 str r1, [r0, 0x4] - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldrh r0, [r7] ldr r1, [r7, 0x4] ldr r2, [r7, 0x8] @@ -69029,7 +69029,7 @@ sub_802C9D4: ; 802C9D4 ands r1, r5 orrs r1, r4 str r1, [r0, 0x4] - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette mov r0, r8 bl Free mov r0, r10 @@ -69051,7 +69051,7 @@ sub_802C9D4: ; 802C9D4 asrs r2, 16 mov r0, sp ldr r3, [sp, 0x30] - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -69133,7 +69133,7 @@ sub_802CB14: ; 802CB14 ldr r1, =sub_802CB7C str r1, [r0, 0x1C] movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim pop {r4-r6} pop {r0} bx r0 @@ -69538,7 +69538,7 @@ sub_802CE48: ; 802CE48 lsls r2, 16 asrs r2, 16 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -69586,7 +69586,7 @@ sub_802CE9C: ; 802CE9C movs r3, 0 ldrsh r2, [r6, r3] movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 lsls r0, r5, 2 @@ -69621,7 +69621,7 @@ sub_802CE9C: ; 802CE9C movs r3, 0 ldrsh r2, [r2, r3] movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 lsls r0, r5, 2 @@ -69715,7 +69715,7 @@ sub_802CF50: ; 802CF50 ldr r0, [r2] mov r2, r8 lsrs r1, r2, 24 - bl obj_anim_image_start + bl StartObjectImageAnim adds r6, 0x1 adds r4, 0x14 subs r5, 0x1 @@ -69758,7 +69758,7 @@ sub_802CF50: ; 802CF50 ldr r0, [r2] mov r2, r8 lsrs r1, r2, 24 - bl obj_anim_image_start + bl StartObjectImageAnim adds r6, 0x1 subs r4, 0x14 subs r5, 0x1 @@ -70015,7 +70015,7 @@ sub_802D150: ; 802D150 lsls r0, 1 adds r1, r0 movs r0, 0 - bl SetBgTileMap + bl SetBgTilemap movs r0, 0x20 str r0, [sp] str r0, [sp, 0x4] @@ -70023,7 +70023,7 @@ sub_802D150: ; 802D150 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 bl sub_802DB8C movs r0, 0 bl sub_802DD64 @@ -70032,11 +70032,11 @@ sub_802D150: ; 802D150 movs r2, 0xE0 bl sub_8098C6C movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram bl sub_8199D98 b @0802D2CC .pool @@ -70215,13 +70215,13 @@ sub_802D3BC: ; 802D3BC adds r0, 0x1C adds r0, r1 ldrb r0, [r0] - bl ClearWindowTileMap + bl ClearWindowTilemap adds r4, 0x1 cmp r4, r5 blt @0802D3E2 @0802D3F8: movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, =0x02022d00 ldr r1, [r0] ldrh r0, [r1, 0x4] @@ -70311,7 +70311,7 @@ sub_802D448: ; 802D448 bne @0802D4EC ldr r0, [r5] ldrb r0, [r0, 0x12] - bl PutWindowTileMap + bl PutWindowTilemap ldr r0, [r5] ldrb r0, [r0, 0x12] movs r1, 0x1 @@ -70322,7 +70322,7 @@ sub_802D448: ; 802D448 movs r2, 0 bl sub_802DB18 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @0802D4D2: ldr r1, [r5] ldrh r0, [r1, 0x4] @@ -70395,14 +70395,14 @@ sub_802D4F4: ; 802D4F4 bne @0802D58E ldr r0, [r5] ldrb r0, [r0, 0x12] - bl PutWindowTileMap + bl PutWindowTilemap ldr r0, [r5] ldrb r0, [r0, 0x12] movs r1, 0x1 movs r2, 0xE bl sub_8098858 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @0802D574: ldr r1, [r5] ldrh r0, [r1, 0x4] @@ -70440,7 +70440,7 @@ sub_802D598: ; 802D598 bl sub_802DA14 bl sub_8198C78 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r1, [r5] ldrh r0, [r1, 0x4] adds r0, 0x1 @@ -70513,14 +70513,14 @@ sub_802D5E4: ; 802D5E4 bne @0802D67E ldr r0, [r5] ldrb r0, [r0, 0x12] - bl PutWindowTileMap + bl PutWindowTilemap ldr r0, [r5] ldrb r0, [r0, 0x12] movs r1, 0x1 movs r2, 0xE bl sub_8098858 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @0802D664: ldr r1, [r5] ldrh r0, [r1, 0x4] @@ -70593,14 +70593,14 @@ sub_802D688: ; 802D688 bne @0802D722 ldr r0, [r5] ldrb r0, [r0, 0x12] - bl PutWindowTileMap + bl PutWindowTilemap ldr r0, [r5] ldrb r0, [r0, 0x12] movs r1, 0x1 movs r2, 0xE bl sub_8098858 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @0802D708: ldr r1, [r5] ldrh r0, [r1, 0x4] @@ -70927,14 +70927,14 @@ sub_802D974: ; 802D974 bne @0802DA0C ldr r0, [r4] ldrb r0, [r0, 0x12] - bl PutWindowTileMap + bl PutWindowTilemap ldr r0, [r4] ldrb r0, [r0, 0x12] movs r1, 0x1 movs r2, 0xE bl sub_8098858 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r1, [r4] ldrb r0, [r1, 0xD] adds r0, 0x1 @@ -71172,9 +71172,9 @@ sub_802DB8C: ; 802DB8C movs r2, 0x3 bl memcpy movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 movs r1, 0 bl FillWindowPixelBuffer @@ -71557,7 +71557,7 @@ sub_802DE1C: ; 802DE1C strh r0, [r1] lsls r0, 24 lsrs r0, 24 - bl ClearWindowTileMap + bl ClearWindowTilemap ldrh r0, [r6, 0x6] adds r0, 0x10 strh r0, [r6, 0x6] @@ -71567,7 +71567,7 @@ sub_802DE1C: ; 802DE1C blt @0802DE6A @0802DEAC: movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0x8 pop {r4-r7} pop {r0} @@ -71717,13 +71717,13 @@ sub_802DFD4: ; 802DFD4 adds r0, 0x1C adds r0, r1 ldrb r0, [r0] - bl PutWindowTileMap + bl PutWindowTilemap adds r4, 0x1 cmp r4, r5 blt @0802DFE4 @0802DFFA: movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram pop {r4,r5} pop {r0} bx r0 @@ -72508,7 +72508,7 @@ sub_802E500: ; 802E500 cmp r6, 0x2 bls @0802E58A lsrs r0, 24 - bl PutWindowTileMap + bl PutWindowTilemap add sp, 0x24 pop {r3-r5} mov r8, r3 @@ -72695,13 +72695,13 @@ sub_802E75C: ; 802E75C lsls r0, 3 ldr r1, =gUnknown_082FE6C8 adds r0, r1 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic movs r2, 0x8 ldrsh r0, [r4, r2] lsls r0, 3 ldr r1, =gUnknown_082FE6D8 adds r0, r1 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette movs r5, 0 movs r3, 0x10 ldrsh r0, [r4, r3] @@ -72720,7 +72720,7 @@ sub_802E75C: ; 802E75C movs r3, 0x14 ldrsh r2, [r4, r3] ldrb r3, [r4, 0xE] - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r1, r5, 1 adds r1, r4 lsls r0, 24 @@ -72824,7 +72824,7 @@ sub_802E83C: ; 802E83C ldr r5, =0x02020630 adds r0, r5 movs r1, 0x4 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0x1C ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -72840,7 +72840,7 @@ sub_802E83C: ; 802E83C lsls r0, 2 adds r0, r5 movs r1, 0x5 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0x1E ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -72878,7 +72878,7 @@ sub_802E8C8: ; 802E8C8 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -72893,14 +72893,14 @@ sub_802E8C8: ; 802E8C8 lsls r0, 3 adds r0, r1 ldrh r0, [r0, 0x6] - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag ldr r1, =gUnknown_082FE6D8 movs r2, 0x8 ldrsh r0, [r4, r2] lsls r0, 3 adds r0, r1 ldrh r0, [r0, 0x4] - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag pop {r4,r5} pop {r0} bx r0 @@ -72965,7 +72965,7 @@ sub_802E938: ; 802E938 lsls r1, 24 lsrs r1, 24 adds r0, r6, 0 - bl obj_anim_image_start + bl StartObjectImageAnim b @0802EA44 @0802E9BA: movs r0, 0x15 @@ -72974,7 +72974,7 @@ sub_802E938: ; 802E938 lsls r1, 24 lsrs r1, 24 adds r0, r6, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r4, =0x02020630 movs r2, 0x1C ldrsh r0, [r5, r2] @@ -73281,7 +73281,7 @@ sub_802EB98: ; 802EB98 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0802EC3E: ldrh r0, [r5] adds r0, 0x1 @@ -73300,18 +73300,18 @@ sub_802EB98: ; 802EB98 lsls r0, 2 ldr r4, =0x02020630 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0x12 ldrsh r1, [r5, r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldrh r0, [r5, 0x4] - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag ldrh r0, [r5, 0x6] - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag adds r0, r6, 0 bl remove_task @0802EC8A: @@ -73429,7 +73429,7 @@ sub_802EC98: ; 802EC98 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0 strh r0, [r4, 0x32] b @0802EDA6 @@ -73708,9 +73708,9 @@ sub_802EF50: ; 802EF50 orrs r0, r1 str r0, [r4, 0x4] mov r0, sp - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic adds r0, r4, 0 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette add sp, 0x10 pop {r4} pop {r0} @@ -73750,7 +73750,7 @@ sub_802EFA8: ; 802EFA8 adds r1, r2, 0 adds r2, r6, 0 mov r3, r8 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 add sp, 0x18 @@ -73803,7 +73803,7 @@ sub_802EFFC: ; 802EFFC adds r1, r2, 0 adds r2, r5, 0 mov r3, r10 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 mov r3, r9 @@ -73815,7 +73815,7 @@ sub_802EFFC: ; 802EFFC adds r1, r4, 0 adds r2, r5, 0 mov r3, r10 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 mov r4, r8 @@ -73850,7 +73850,7 @@ sub_802EFFC: ; 802EFFC lsls r0, 2 adds r0, r2 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -77632,27 +77632,27 @@ dp01_build_cmdbuf_x37_a: ; 80344C8 .pool thumb_func_end dp01_build_cmdbuf_x37_a - thumb_func_start call_LZZUnCompWram -; void call_LZZUnCompWram(void *src, void *dest) -call_LZZUnCompWram: ; 8034518 + thumb_func_start LZDecompressWram +; void LZDecompressWram(void *src, void *dest) +LZDecompressWram: ; 8034518 push {lr} bl LZ77UnCompWram pop {r0} bx r0 - thumb_func_end call_LZZUnCompWram + thumb_func_end LZDecompressWram - thumb_func_start call_LZZUnCompVram -; void call_LZZUnCompVram(void *src, void *dest) -call_LZZUnCompVram: ; 8034524 + thumb_func_start LZDecompressVram +; void LZDecompressVram(void *src, void *dest) +LZDecompressVram: ; 8034524 push {lr} bl LZ77UnCompVram pop {r0} bx r0 - thumb_func_end call_LZZUnCompVram + thumb_func_end LZDecompressVram - thumb_func_start gpu_tile_obj_decompress_and_load -; u16 gpu_tile_obj_decompress_and_load(struct obj_tiles *x) -gpu_tile_obj_decompress_and_load: ; 8034530 + thumb_func_start LoadCompressedObjectPic +; u16 LoadCompressedObjectPic(struct obj_tiles *pic) +LoadCompressedObjectPic: ; 8034530 push {r4,r5,lr} sub sp, 0x8 adds r4, r0, 0 @@ -77667,7 +77667,7 @@ gpu_tile_obj_decompress_and_load: ; 8034530 orrs r0, r1 str r0, [sp, 0x4] mov r0, sp - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic lsls r0, 16 lsrs r0, 16 add sp, 0x8 @@ -77675,11 +77675,11 @@ gpu_tile_obj_decompress_and_load: ; 8034530 pop {r1} bx r1 .pool - thumb_func_end gpu_tile_obj_decompress_and_load + thumb_func_end LoadCompressedObjectPic - thumb_func_start gpu_tile_obj_decompress_and_load2 -; void gpu_tile_obj_decompress_and_load2(struct obj_tiles *x, void *dest) -gpu_tile_obj_decompress_and_load2: ; 8034564 + thumb_func_start LoadCompressedObjectPicOverrideBuffer +; void LoadCompressedObjectPicOverrideBuffer(struct obj_tiles *pic, void *tempBuffer) +LoadCompressedObjectPicOverrideBuffer: ; 8034564 push {r4,r5,lr} sub sp, 0x8 adds r4, r0, 0 @@ -77693,16 +77693,16 @@ gpu_tile_obj_decompress_and_load2: ; 8034564 orrs r0, r1 str r0, [sp, 0x4] mov r0, sp - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic add sp, 0x8 pop {r4,r5} pop {r0} bx r0 - thumb_func_end gpu_tile_obj_decompress_and_load2 + thumb_func_end LoadCompressedObjectPicOverrideBuffer - thumb_func_start gpu_pal_obj_decompress_and_apply -; void gpu_pal_obj_decompress_and_apply(struct rom_obj_pal_data *x) -gpu_pal_obj_decompress_and_apply: ; 803458C + thumb_func_start LoadCompressedObjectPalette +; void LoadCompressedObjectPalette(struct ObjectPaletteInfo *palette) +LoadCompressedObjectPalette: ; 803458C push {r4,r5,lr} sub sp, 0x8 adds r5, r0, 0 @@ -77718,17 +77718,17 @@ gpu_pal_obj_decompress_and_apply: ; 803458C orrs r0, r2 str r0, [sp, 0x4] mov r0, sp - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette add sp, 0x8 pop {r4,r5} pop {r0} bx r0 .pool - thumb_func_end gpu_pal_obj_decompress_and_apply + thumb_func_end LoadCompressedObjectPalette - thumb_func_start gpu_pal_obj_decompress_and_apply2 -; void gpu_pal_obj_decompress_and_apply2(struct rom_obj_pal_data *x, void *dest) -gpu_pal_obj_decompress_and_apply2: ; 80345C0 + thumb_func_start LoadCompressedObjectPaletteOverrideBuffer +; void LoadCompressedObjectPaletteOverrideBuffer(struct ObjectPaletteInfo *palette, void *tempBuffer) +LoadCompressedObjectPaletteOverrideBuffer: ; 80345C0 push {r4,r5,lr} sub sp, 0x8 adds r5, r0, 0 @@ -77743,17 +77743,17 @@ gpu_pal_obj_decompress_and_apply2: ; 80345C0 orrs r0, r2 str r0, [sp, 0x4] mov r0, sp - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette add sp, 0x8 pop {r4,r5} pop {r0} bx r0 .pool - thumb_func_end gpu_pal_obj_decompress_and_apply2 + thumb_func_end LoadCompressedObjectPaletteOverrideBuffer - thumb_func_start sub_80345F0 -; void sub_80345F0(void **a1, void *a2, int species_num) -sub_80345F0: ; 80345F0 + thumb_func_start DecompressPicFromTable +; void DecompressPicFromTable(void **picTable, void *dest, u32 index) +DecompressPicFromTable: ; 80345F0 push {r4,r5,lr} adds r3, r0, 0 adds r4, r1, 0 @@ -77774,15 +77774,15 @@ sub_80345F0: ; 80345F0 @08034618: adds r0, r4, 0 adds r1, r5, 0 - bl duplicate_deoxys_graphics_data + bl DuplicateDeoxysTiles pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_80345F0 + thumb_func_end DecompressPicFromTable - thumb_func_start sub_8034628 -; void sub_8034628(int *a1, void *a2, int species_num, int a4) -sub_8034628: ; 8034628 + thumb_func_start DecompressMonPic_DetectFrontOrBack +; void DecompressMonPic_DetectFrontOrBack(void **picTable, void *dest, u32 speciesId, u32 personality) +DecompressMonPic_DetectFrontOrBack: ; 8034628 push {r4,r5,lr} sub sp, 0x4 adds r4, r0, 0 @@ -77798,17 +77798,17 @@ sub_8034628: ; 8034628 str r1, [sp] adds r0, r4, 0 adds r1, r5, 0 - bl load_poke_gfx_probably + bl DecompressMonPic_2 add sp, 0x4 pop {r4,r5} pop {r0} bx r0 .pool - thumb_func_end sub_8034628 + thumb_func_end DecompressMonPic_DetectFrontOrBack - thumb_func_start sub_8034654 -; void sub_8034654(void **a1, void *a2, int species_num, unsigned int a4, u8 a5) -sub_8034654: ; 8034654 + thumb_func_start DecompressMonPic +; void DecompressMonPic(void **picTable, void *dest, u32 speciesId, u32 personality, BOOL isFrontPic) +DecompressMonPic: ; 8034654 push {r4-r7,lr} mov r7, r8 push {r7} @@ -77889,7 +77889,7 @@ sub_8034654: ; 8034654 @080346F0: adds r0, r4, 0 adds r1, r7, 0 - bl duplicate_deoxys_graphics_data + bl DuplicateDeoxysTiles lsls r0, r7, 16 lsrs r0, 16 adds r1, r5, 0 @@ -77901,16 +77901,17 @@ sub_8034654: ; 8034654 pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_8034654 + thumb_func_end DecompressMonPic - thumb_func_start sub_8034710 -sub_8034710: ; 8034710 + thumb_func_start Unused_LZDecompressWramIndirect +; void Unused_LZDecompressWramIndirect(void **src) +Unused_LZDecompressWramIndirect: ; 8034710 push {lr} ldr r0, [r0] bl LZ77UnCompWram pop {r0} bx r0 - thumb_func_end sub_8034710 + thumb_func_end Unused_LZDecompressWramIndirect thumb_func_start sub_803471C sub_803471C: ; 803471C @@ -78264,9 +78265,9 @@ sub_8034974: ; 8034974 bx lr thumb_func_end sub_8034974 - thumb_func_start gpu_tile_obj_decompress_and_load3 -; u16 gpu_tile_obj_decompress_and_load3(struct obj_tiles *x) -gpu_tile_obj_decompress_and_load3: ; 8034988 + thumb_func_start LoadCompressedObjectPicUsingHeap +; u32 LoadCompressedObjectPicUsingHeap(struct obj_tiles *pic) +LoadCompressedObjectPicUsingHeap: ; 8034988 push {r4,r5,lr} sub sp, 0x8 adds r4, r0, 0 @@ -78285,7 +78286,7 @@ gpu_tile_obj_decompress_and_load3: ; 8034988 orrs r0, r1 str r0, [sp, 0x4] mov r0, sp - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic adds r0, r5, 0 bl Free movs r0, 0 @@ -78293,11 +78294,11 @@ gpu_tile_obj_decompress_and_load3: ; 8034988 pop {r4,r5} pop {r1} bx r1 - thumb_func_end gpu_tile_obj_decompress_and_load3 + thumb_func_end LoadCompressedObjectPicUsingHeap - thumb_func_start gpu_pal_obj_decompress_and_apply3 -; int gpu_pal_obj_decompress_and_apply3(struct rom_obj_pal_data *x) -gpu_pal_obj_decompress_and_apply3: ; 80349C4 + thumb_func_start LoadCompressedObjectPaletteUsingHeap +; u32 LoadCompressedObjectPaletteUsingHeap(struct ObjectPaletteInfo *palette) +LoadCompressedObjectPaletteUsingHeap: ; 80349C4 push {r4,r5,lr} sub sp, 0x8 adds r4, r0, 0 @@ -78317,7 +78318,7 @@ gpu_pal_obj_decompress_and_apply3: ; 80349C4 orrs r0, r2 str r0, [sp, 0x4] mov r0, sp - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette adds r0, r5, 0 bl Free movs r0, 0 @@ -78326,11 +78327,11 @@ gpu_pal_obj_decompress_and_apply3: ; 80349C4 pop {r1} bx r1 .pool - thumb_func_end gpu_pal_obj_decompress_and_apply3 + thumb_func_end LoadCompressedObjectPaletteUsingHeap - thumb_func_start LZ77UnCompAnyRam -; void LZ77UnCompAnyRam(void **a1, void *a2, int species_num) -LZ77UnCompAnyRam: ; 8034A08 + thumb_func_start DecompressPicFromTable_2 +; void DecompressPicFromTable_2(void **picTable, void *dest, u32 index) +DecompressPicFromTable_2: ; 8034A08 push {r4,r5,lr} adds r3, r0, 0 adds r4, r1, 0 @@ -78351,15 +78352,15 @@ LZ77UnCompAnyRam: ; 8034A08 @08034A30: adds r0, r4, 0 adds r1, r5, 0 - bl duplicate_deoxys_graphics_data + bl DuplicateDeoxysTiles pop {r4,r5} pop {r0} bx r0 - thumb_func_end LZ77UnCompAnyRam + thumb_func_end DecompressPicFromTable_2 - thumb_func_start load_poke_gfx_probably -; void load_poke_gfx_probably(void **src, u8 *pixels, u32 species, u32 personality, u8 isFrontPic) -load_poke_gfx_probably: ; 8034A40 + thumb_func_start DecompressMonPic_2 +; void DecompressMonPic_2(void **picTable, void *dest, u32 speciesId, u32 personality, BOOL isFrontPic) +DecompressMonPic_2: ; 8034A40 push {r4-r7,lr} mov r7, r8 push {r7} @@ -78440,7 +78441,7 @@ load_poke_gfx_probably: ; 8034A40 @08034ADC: adds r0, r4, 0 adds r1, r7, 0 - bl duplicate_deoxys_graphics_data + bl DuplicateDeoxysTiles lsls r0, r7, 16 lsrs r0, 16 adds r1, r5, 0 @@ -78452,11 +78453,11 @@ load_poke_gfx_probably: ; 8034A40 pop {r4-r7} pop {r0} bx r0 - thumb_func_end load_poke_gfx_probably + thumb_func_end DecompressMonPic_2 - thumb_func_start help_system_enable_unless_flashback__sp199 -; void help_system_enable_unless_flashback__sp199(int *a1, void *a2, int species_num, int a4) -help_system_enable_unless_flashback__sp199: ; 8034AFC + thumb_func_start DecompressMonPic_DetectFrontOrBack_2 +; void DecompressMonPic_DetectFrontOrBack_2(void **picTable, void *dest, u32 speciesId, u32 personality) +DecompressMonPic_DetectFrontOrBack_2: ; 8034AFC push {r4,r5,lr} sub sp, 0x4 adds r4, r0, 0 @@ -78472,16 +78473,15 @@ help_system_enable_unless_flashback__sp199: ; 8034AFC str r1, [sp] adds r0, r4, 0 adds r1, r5, 0 - bl load_poke_gfx_probably + bl DecompressMonPic_2 add sp, 0x4 pop {r4,r5} pop {r0} bx r0 .pool - thumb_func_end help_system_enable_unless_flashback__sp199 + thumb_func_end DecompressMonPic_DetectFrontOrBack_2 thumb_func_start sub_8034B28 -; void sub_8034B28(void **a1, void *a2, int species_num) sub_8034B28: ; 8034B28 push {lr} adds r3, r0, 0 @@ -78502,9 +78502,9 @@ sub_8034B28: ; 8034B28 bx r0 thumb_func_end sub_8034B28 - thumb_func_start sub_8034B50 -; void sub_8034B50(int a1, int a2) -sub_8034B50: ; 8034B50 + thumb_func_start DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack +; void DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack(void **picTable, void *dest, u32 speciesId, u32 personality) +DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack: ; 8034B50 push {r4,r5,lr} sub sp, 0x4 adds r4, r0, 0 @@ -78520,17 +78520,17 @@ sub_8034B50: ; 8034B50 str r1, [sp] adds r0, r4, 0 adds r1, r5, 0 - bl sub_8034B7C + bl DecompressMonPicWithoutDuplicatingDeoxysTiles add sp, 0x4 pop {r4,r5} pop {r0} bx r0 .pool - thumb_func_end sub_8034B50 + thumb_func_end DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack - thumb_func_start sub_8034B7C -; void sub_8034B7C(void **a1, void *a2, int species_num, int a4, u8 a5) -sub_8034B7C: ; 8034B7C + thumb_func_start DecompressMonPicWithoutDuplicatingDeoxysTiles +; void DecompressMonPicWithoutDuplicatingDeoxysTiles(void **picTable, void *dest, u32 speciesId, u32 personality, BOOL isFrontPic) +DecompressMonPicWithoutDuplicatingDeoxysTiles: ; 8034B7C push {r4-r7,lr} mov r7, r8 push {r7} @@ -78620,11 +78620,11 @@ sub_8034B7C: ; 8034B7C pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_8034B7C + thumb_func_end DecompressMonPicWithoutDuplicatingDeoxysTiles - thumb_func_start duplicate_deoxys_graphics_data -; void duplicate_deoxys_graphics_data(int a1, int species_num) -duplicate_deoxys_graphics_data: ; 8034C30 + thumb_func_start DuplicateDeoxysTiles +; void DuplicateDeoxysTiles(void *pointer, u32 speciesId) +DuplicateDeoxysTiles: ; 8034C30 push {lr} adds r3, r0, 0 movs r0, 0xCD @@ -78641,7 +78641,7 @@ duplicate_deoxys_graphics_data: ; 8034C30 pop {r0} bx r0 .pool - thumb_func_end duplicate_deoxys_graphics_data + thumb_func_end DuplicateDeoxysTiles thumb_func_start sub_8034C54 sub_8034C54: ; 8034C54 @@ -78785,7 +78785,7 @@ sub_8034D14: ; 8034D14 beq @08034DD4 ldr r0, [r5, 0x8] ldrh r0, [r0, 0x6] - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag ldr r2, [r6] ldr r1, [r2, 0x4] adds r1, r4, r1 @@ -78803,7 +78803,7 @@ sub_8034D14: ; 8034D14 cmp r0, 0 beq @08034D94 adds r0, r1, 0 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic b @08034DB4 .pool @08034D94: @@ -78820,7 +78820,7 @@ sub_8034D14: ; 8034D14 orrs r1, r0 str r1, [sp, 0x4] mov r0, sp - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic @08034DB4: ldr r1, [r6] ldr r1, [r1, 0x4] @@ -78845,7 +78845,7 @@ sub_8034D14: ; 8034D14 @08034DE0: ldr r0, [r5, 0xC] ldrh r0, [r0, 0x4] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag ldr r6, =0x02022e10 ldr r1, [r6] ldr r1, [r1, 0x4] @@ -78862,7 +78862,7 @@ sub_8034D14: ; 8034D14 cmp r0, 0xFF bne @08034E14 ldr r0, [r5, 0xC] - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette ldr r1, [r6] ldr r1, [r1, 0x4] adds r1, r4, r1 @@ -79653,7 +79653,7 @@ sub_80353DC: ; 80353DC lsls r0, 2 adds r0, r1 ldrh r0, [r0, 0x10] - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag @08035442: adds r0, r4, 0 bl sub_80355B4 @@ -79666,7 +79666,7 @@ sub_80353DC: ; 80353DC lsls r0, 2 adds r0, r1 ldrh r0, [r0, 0x12] - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag @0803545E: ldr r0, =0x02022e10 ldr r0, [r0] @@ -79913,12 +79913,12 @@ sub_80355F8: ; 80355F8 thumb_func_start sub_8035608 sub_8035608: ; 8035608 push {lr} - bl reset_all_obj_data + bl ResetAllObjectData ldr r0, =gUnknown_0831AC88 movs r1, 0 movs r2, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r2, =0x02020630 @@ -79941,8 +79941,8 @@ sub_8035608: ; 8035608 thumb_func_start sub_8035648 sub_8035648: ; 8035648 push {lr} - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad pop {r0} bx r0 thumb_func_end sub_8035648 @@ -79970,10 +79970,10 @@ trs_config: ; 8035658 ldr r4, =0x02023060 ldr r1, [r4] movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap b @080356AA .pool @080356A4: @@ -80073,10 +80073,10 @@ load_battle_oval_graphics: ; 8035770 beq @080357B0 ldr r0, =gUnknown_08D7C440 ldr r1, =0x06008000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7CA28 ldr r1, =0x0600d000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7C9EC b @08035A52 .pool @@ -80088,10 +80088,10 @@ load_battle_oval_graphics: ; 8035770 beq @080357E4 ldr r0, =gUnknown_08D7BB14 ldr r1, =0x06008000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7C154 ldr r1, =0x0600d000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7DF30 b @08035A52 .pool @@ -80103,10 +80103,10 @@ load_battle_oval_graphics: ; 8035770 beq @08035818 ldr r0, =gUnknown_08D7A108 ldr r1, =0x06008000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7A720 ldr r1, =0x0600d000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7DEF4 b @08035A52 .pool @@ -80118,10 +80118,10 @@ load_battle_oval_graphics: ; 8035770 beq @0803584C ldr r0, =gUnknown_08D7D590 ldr r1, =0x06008000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7DC04 ldr r1, =0x0600d000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7E234 b @08035A52 .pool @@ -80142,10 +80142,10 @@ load_battle_oval_graphics: ; 8035770 bne @08035898 ldr r0, =gUnknown_08D7C440 ldr r1, =0x06008000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7CA28 ldr r1, =0x0600d000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7DFC4 b @08035A52 .pool @@ -80154,10 +80154,10 @@ load_battle_oval_graphics: ; 8035770 bne @080358C4 ldr r0, =gUnknown_08D7CCD8 ldr r1, =0x06008000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7D2E0 ldr r1, =0x0600d000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7E1F8 b @08035A52 .pool @@ -80194,7 +80194,7 @@ load_battle_oval_graphics: ; 8035770 adds r0, r4 ldr r0, [r0] ldr r1, =0x06008000 - bl call_LZZUnCompVram + bl LZDecompressVram ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -80203,7 +80203,7 @@ load_battle_oval_graphics: ; 8035770 adds r0, r1 ldr r0, [r0] ldr r1, =0x0600d000 - bl call_LZZUnCompVram + bl LZDecompressVram ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -80216,70 +80216,70 @@ load_battle_oval_graphics: ; 8035770 @08035950: ldr r0, =gUnknown_08D7C440 ldr r1, =0x06008000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7CA28 ldr r1, =0x0600d000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7DF88 b @08035A52 .pool @08035978: ldr r0, =gUnknown_08D7CCD8 ldr r1, =0x06008000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7D2E0 ldr r1, =0x0600d000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7E060 b @08035A52 .pool @080359A0: ldr r0, =gUnknown_08D7CCD8 ldr r1, =0x06008000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7D2E0 ldr r1, =0x0600d000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7E000 b @08035A52 .pool @080359C8: ldr r0, =gUnknown_08D7CCD8 ldr r1, =0x06008000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7D2E0 ldr r1, =0x0600d000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7E0CC b @08035A52 .pool @080359F0: ldr r0, =gUnknown_08D7CCD8 ldr r1, =0x06008000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7D2E0 ldr r1, =0x0600d000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7E11C b @08035A52 .pool @08035A18: ldr r0, =gUnknown_08D7CCD8 ldr r1, =0x06008000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7D2E0 ldr r1, =0x0600d000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7E164 b @08035A52 .pool @08035A40: ldr r0, =gUnknown_08D7CCD8 ldr r1, =0x06008000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7D2E0 ldr r1, =0x0600d000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7E1A8 @08035A52: movs r1, 0x20 @@ -80290,10 +80290,10 @@ load_battle_oval_graphics: ; 8035770 @08035A70: ldr r0, =gUnknown_08D7C440 ldr r1, =0x06008000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7CA28 ldr r1, =0x0600d000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7C9EC movs r1, 0x20 movs r2, 0x60 @@ -80311,14 +80311,14 @@ sub_8035AA4: ; 8035AA4 ldr r0, =gUnknown_08C00000 movs r1, 0xC0 lsls r1, 19 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r1, =gUnknown_08C00524 movs r0, 0 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, =gUnknown_08C004E0 movs r1, 0 movs r2, 0x40 @@ -80449,9 +80449,9 @@ sub_8035AE4: ; 8035AE4 add r1, sp, 0xC mov r2, r12 mov r3, r9 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette mov r0, r8 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @08035C36 .pool @08035BCC: @@ -80503,9 +80503,9 @@ sub_8035AE4: ; 8035AE4 add r1, sp, 0xC mov r2, r12 mov r3, r9 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette mov r0, r8 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @08035C36: add sp, 0x18 pop {r3,r4} @@ -80811,7 +80811,7 @@ task00_0800F6FC: ; 8035D74 .pool @08035EC4: ldr r0, =0x00002710 - bl gpu_pal_alloc_new + bl AllocObjectPalette lsls r0, 24 ldr r2, =0x02037714 lsrs r0, 19 @@ -80827,7 +80827,7 @@ task00_0800F6FC: ; 8035D74 movs r1, 0x6F movs r2, 0x50 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r4, =0x0202449c ldr r1, [r4] adds r1, 0x7D @@ -80836,7 +80836,7 @@ task00_0800F6FC: ; 8035D74 movs r1, 0x81 movs r2, 0x50 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r4] adds r1, 0x7E strb r0, [r1] @@ -81106,10 +81106,10 @@ sub_8036154: ; 8036154 beq @08036208 ldr r0, =gUnknown_08D778F0 ldr r1, =0x06004000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D77B0C ldr r1, =0x06010000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D77AE4 movs r1, 0x60 movs r2, 0x20 @@ -81126,16 +81126,16 @@ sub_8036154: ; 8036154 adds r1, r4, 0 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer movs r0, 0x2 adds r1, r4, 0 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x48 movs r1, 0x36 bl SetGpuReg @@ -81149,7 +81149,7 @@ sub_8036154: ; 8036154 ldr r0, =0x02022e1e strh r1, [r0] ldr r0, =gUnknown_0831AA00 - bl gpu_tile_obj_decompress_and_load3 + bl LoadCompressedObjectPicUsingHeap b @080363AC .pool @08036208: @@ -81170,7 +81170,7 @@ sub_8036154: ; 8036154 @08036224: ldr r0, =gUnknown_08D820D4 ldr r1, =0x06004000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D824E4 b @08036382 .pool @@ -81187,16 +81187,16 @@ sub_8036154: ; 8036154 movs r0, 0x1 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer ldr r1, =gUnknown_08D85A1C movs r0, 0x2 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @080363AC .pool @0803628C: @@ -81207,7 +81207,7 @@ sub_8036154: ; 8036154 beq @080362B0 ldr r0, =gUnknown_08D81610 ldr r1, =0x06004000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D81E2C b @08036382 .pool @@ -81219,7 +81219,7 @@ sub_8036154: ; 8036154 beq @080362D4 ldr r0, =gUnknown_08D7F9F8 ldr r1, =0x06004000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D7FEC4 b @08036382 .pool @@ -81231,7 +81231,7 @@ sub_8036154: ; 8036154 beq @080362F8 ldr r0, =gUnknown_08D82608 ldr r1, =0x06004000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D82C70 b @08036382 .pool @@ -81252,7 +81252,7 @@ sub_8036154: ; 8036154 bne @08036334 ldr r0, =gUnknown_08D820D4 ldr r1, =0x06004000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D824E4 b @08036382 .pool @@ -81261,7 +81261,7 @@ sub_8036154: ; 8036154 bne @08036350 ldr r0, =gUnknown_08D820D4 ldr r1, =0x06004000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D824E4 b @08036382 .pool @@ -81281,7 +81281,7 @@ sub_8036154: ; 8036154 adds r0, r1 ldr r0, [r0] ldr r1, =0x06004000 - bl call_LZZUnCompVram + bl LZDecompressVram ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -81291,16 +81291,16 @@ sub_8036154: ; 8036154 ldr r0, [r0] @08036382: ldr r1, =0x0600e000 - bl call_LZZUnCompVram + bl LZDecompressVram b @080363AC .pool @0803639C: ldr r0, =gUnknown_08D820D4 ldr r1, =0x06004000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D824E4 ldr r1, =0x0600e000 - bl call_LZZUnCompVram + bl LZDecompressVram @080363AC: pop {r4,r5} pop {r0} @@ -81337,7 +81337,7 @@ sub_80363C4: ; 80363C4 ldr r0, =gUnknown_08C00000 movs r1, 0xC0 lsls r1, 19 - bl call_LZZUnCompVram + bl LZDecompressVram b @08036758 .pool @0803640C: @@ -81345,9 +81345,9 @@ sub_80363C4: ; 80363C4 movs r0, 0 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @08036758 .pool @08036424: @@ -81454,7 +81454,7 @@ sub_80363C4: ; 80363C4 ldr r0, =gUnknown_08D7C440 @0803651A: ldr r1, =0x06008000 - bl call_LZZUnCompVram + bl LZDecompressVram b @08036758 .pool @0803652C: @@ -81565,7 +81565,7 @@ sub_80363C4: ; 80363C4 ldr r0, =gUnknown_08D7CA28 @08036626: ldr r1, =0x0600d000 - bl call_LZZUnCompVram + bl LZDecompressVram b @08036758 .pool @08036638: @@ -81878,10 +81878,10 @@ sub_80367D4: ; 80367D4 @080368FE: bl c2_berry_program_update_menu bl sub_8035AA4 - bl reset_all_obj_data + bl ResetAllObjectData bl clear_tasks bl sub_8036154 - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator ldr r1, =0x0300301c movs r0, 0x4 strb r0, [r1] @@ -82667,8 +82667,8 @@ sub_8036EB8: ; 8036EB8 sub_8036FAC: ; 8036FAC push {r4-r6,lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl link_get_multiplayer_id lsls r0, 24 lsrs r6, r0, 24 @@ -83137,8 +83137,8 @@ sub_8037458: ; 8037458 push {r4-r7,lr} sub sp, 0x4 bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl link_get_multiplayer_id lsls r0, 24 lsrs r6, r0, 24 @@ -83851,8 +83851,8 @@ sub_8037ADC: ; 8037ADC adds r0, 0xAC mov r10, r0 bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad ldr r5, =0x02024332 ldrb r0, [r5] cmp r0, 0x1 @@ -84081,8 +84081,8 @@ intro_end: ; 8037D2C adds r7, r0, 0 adds r7, 0xAC bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad ldr r5, =0x02024332 ldrb r0, [r5] cmp r0, 0 @@ -84159,8 +84159,8 @@ sub_8037DF4: ; 8037DF4 adds r0, 0x25 strb r7, [r0] bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad ldr r0, =0x02024332 ldrb r0, [r0] cmp r0, 0xA @@ -84854,8 +84854,8 @@ sub_8037DF4: ; 8037DF4 sub_8038420: ; 8038420 push {lr} sub sp, 0x4 - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl RunTextPrinters bl fade_and_return_progress_probably bl run_active_tasks @@ -85659,8 +85659,8 @@ vblank_cb_08078BB4: ; 8038A28 ldrh r1, [r0] movs r0, 0x46 bl SetGpuReg - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram bl sub_80BA0A8 pop {r0} @@ -85717,13 +85717,13 @@ sub_8038B04: ; 8038B04 beq @08038B6A ldr r4, =0x00002710 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag adds r0, r5, 0 bl obj_free_rotscale_entry adds r0, r5, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08038B6A: pop {r4,r5} pop {r0} @@ -86083,13 +86083,13 @@ sub_8038D64: ; 8038D64 movs r2, 0x40 bl decompress_palette bl sub_803570C - bl reset_all_obj_data + bl ResetAllObjectData bl clear_tasks bl sub_8036154 movs r0, 0x4A movs r1, 0x37 bl SetGpuReg - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator ldr r1, =0x0300301c movs r0, 0x4 strb r0, [r1] @@ -86129,8 +86129,8 @@ sub_8038D64: ; 8038D64 sub_8038F14: ; 8038F14 push {lr} bl sub_8038F34 - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl RunTextPrinters bl fade_and_return_progress_probably bl run_active_tasks @@ -86561,9 +86561,9 @@ sub_80392A8: ; 80392A8 adds r4, 0x1 cmp r4, 0x1 ble @080392FE - bl reset_all_obj_data + bl ResetAllObjectData bl clear_tasks - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator ldr r1, =0x0300301c movs r0, 0x4 strb r0, [r1] @@ -86592,8 +86592,8 @@ sub_80392A8: ; 80392A8 sub_803937C: ; 803937C push {lr} bl sub_803939C - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl RunTextPrinters bl fade_and_return_progress_probably bl run_active_tasks @@ -87069,7 +87069,7 @@ oac_poke_opponent: ; 80397DC ldr r1, =sub_803980C str r1, [r0, 0x1C] movs r1, 0 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent movs r0, 0x80 lsls r0, 10 ldr r1, =0x00002108 @@ -87133,7 +87133,7 @@ sub_8039838: ; 8039838 str r0, [r4, 0x1C] adds r0, r4, 0 movs r1, 0 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent movs r0, 0x80 lsls r0, 10 ldr r1, =0x00002108 @@ -87395,7 +87395,7 @@ sub_8039A48: ; 8039A48 adds r0, r4, 0 bl obj_free_rotscale_entry adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles b @08039AC8 @08039A7C: ldrh r0, [r4, 0x2E] @@ -87434,7 +87434,7 @@ sub_8039A48: ; 8039A48 adds r1, r0 ldrb r1, [r1] adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @08039AC8: pop {r4} pop {r0} @@ -87545,7 +87545,7 @@ sub_8039B58: ; 8039B58 beq @08039B94 adds r0, r4, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim @08039B94: ldrh r1, [r4, 0x32] adds r0, r4, 0 @@ -87797,7 +87797,7 @@ dp11b_obj_free: ; 8039D48 ldrh r1, [r0, 0x34] lsls r1, 24 lsrs r4, r1, 24 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r6] ldr r1, [r0, 0x4] adds r1, r5, r1 @@ -87828,7 +87828,7 @@ dp11b_obj_free: ; 8039D48 ldrh r1, [r0, 0x34] lsls r1, 24 lsrs r4, r1, 24 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r6] ldr r1, [r0, 0x4] adds r1, r5, r1 @@ -87938,7 +87938,7 @@ sub_8039E84: ; 8039E84 push {r4,lr} adds r4, r0, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =sub_8039E60 str r0, [r4, 0x1C] pop {r4} @@ -95064,7 +95064,7 @@ sub_803DE40: ; 803DE40 ands r0, r1 cmp r0, 0 bne @0803DE86 - bl reset_all_obj_data + bl ResetAllObjectData ldr r0, =0x03005d54 ldrb r0, [r0] cmp r0, 0 @@ -125866,7 +125866,7 @@ atk6C_8026208: ; 804EF04 @0804F000: bl sub_804F100 movs r0, 0xD - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0xD movs r1, 0x3 bl CopyWindowToVram @@ -125921,12 +125921,12 @@ atk6C_8026208: ; 804EF04 cmp r0, 0 bne @0804F0F2 movs r0, 0xE - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0xE movs r1, 0x1 bl CopyWindowToVram movs r0, 0xD - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0xD movs r1, 0x1 bl CopyWindowToVram @@ -126047,7 +126047,7 @@ sub_804F17C: ; 804F17C movs r3, 0 bl CopyToWindowPixelBuffer movs r0, 0xE - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0xE movs r1, 0x3 bl CopyWindowToVram @@ -126329,15 +126329,15 @@ sub_804F384: ; 804F384 orrs r0, r1 str r0, [r4, 0x4] mov r0, sp - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic adds r0, r4, 0 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette ldr r0, =gUnknown_0831C3C0 movs r1, 0x80 lsls r1, 1 movs r2, 0xA movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r2, =0x02020630 @@ -126381,12 +126381,12 @@ sub_804F450: ; 804F450 cmp r0, 0 beq @0804F48C adds r0, r2, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r4, =0x0000d75a adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag @0804F48C: pop {r4} pop {r0} @@ -140023,7 +140023,7 @@ sub_8056A3C: ; 8056A3C add r1, sp, 0xC mov r7, r9 lsrs r3, r7, 24 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette b @08056B50 .pool @08056B38: @@ -140037,7 +140037,7 @@ sub_8056A3C: ; 8056A3C add r1, sp, 0xC mov r7, r9 lsrs r3, r7, 24 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette @08056B50: adds r4, 0x1 ldr r0, [sp, 0x1C] @@ -140082,9 +140082,9 @@ sub_8056B74: ; 8056B74 movs r0, 0 add r1, sp, 0xC movs r2, 0x19 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0x10 pop {r0} bx r0 @@ -140113,9 +140113,9 @@ sub_8056BAC: ; 8056BAC movs r0, 0 add r1, sp, 0xC movs r2, 0x19 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0x10 pop {r0} bx r0 @@ -143382,7 +143382,7 @@ bx_802F7A0: ; 80588B4 adds r0, r1 lsls r0, 2 adds r0, r6 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles bl dp01_tbl1_exec_completed @08058908: pop {r4-r6} @@ -143578,9 +143578,9 @@ sub_805896C: ; 805896C strb r4, [r0, 0x1] ldr r4, =0x000027f9 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag ldr r7, =0x0202406e ldrb r1, [r6] lsls r0, r1, 1 @@ -143987,7 +143987,7 @@ sub_8058B40: ; 8058B40 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08058E48: ldr r1, =0x03005d7c ldr r4, =0x02024064 @@ -143999,7 +143999,7 @@ sub_8058B40: ; 8058B40 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r3, =0x020244d0 ldr r0, [r3] ldr r2, [r0, 0x8] @@ -144114,9 +144114,9 @@ sub_8058EDC: ; 8058EDC strb r0, [r1, 0x1] ldr r4, =0x000027f9 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag ldr r0, [r5] ldrb r2, [r6] ldr r1, [r0] @@ -144243,7 +144243,7 @@ sub_805902C: ; 805902C cmp r0, 0 bne @080590D2 adds r0, r3, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r4, =0x03005d70 ldrb r1, [r5] adds r0, r1, r4 @@ -144975,7 +144975,7 @@ sub_80596A8: ; 80596A8 adds r0, r1 lsls r0, 2 adds r0, r6 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, =0x03005d70 ldrb r0, [r4] adds r0, r1 @@ -145022,7 +145022,7 @@ sub_8059744: ; 8059744 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 @@ -145568,9 +145568,9 @@ battle_menu_cursor_related_2: ; 8059C28 str r0, [sp, 0x8] movs r0, 0 add r1, sp, 0xC - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0x10 pop {r0} bx r0 @@ -145602,9 +145602,9 @@ battle_menu_cursor_related: ; 8059C70 str r0, [sp, 0x8] movs r0, 0 add r1, sp, 0xC - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0x10 pop {r0} bx r0 @@ -145638,9 +145638,9 @@ sub_8059CB4: ; 8059CB4 str r0, [sp, 0x8] movs r0, 0 add r1, sp, 0xC - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0x10 pop {r4} pop {r0} @@ -145675,9 +145675,9 @@ sub_8059CF8: ; 8059CF8 str r0, [sp, 0x8] movs r0, 0 add r1, sp, 0xC - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0x10 pop {r0} bx r0 @@ -148068,7 +148068,7 @@ sub_805B258: ; 805B258 mov r0, r10 adds r1, r5, 0 adds r2, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r4, =0x020241e4 adds r4, r6, r4 strb r0, [r4] @@ -148120,7 +148120,7 @@ sub_805B258: ; 805B258 ldr r1, =0x020244e4 adds r6, r1 ldrb r1, [r6] - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -148207,7 +148207,7 @@ sub_805B3D4: ; 805B3D4 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 @@ -148500,7 +148500,7 @@ sub_805B4F0: ; 805B4F0 mov r0, r8 mov r1, r9 adds r2, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r4, =0x020241e4 ldrb r1, [r6] adds r1, r4 @@ -148509,7 +148509,7 @@ sub_805B4F0: ; 805B4F0 lsls r5, 3 adds r5, r0 ldrh r0, [r5, 0x4] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag ldr r5, =0x02020630 ldrb r1, [r6] adds r1, r4 @@ -148612,7 +148612,7 @@ sub_805B4F0: ; 805B4F0 adds r0, r6, 0 mov r1, r8 adds r2, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r6, =0x020241e4 ldrb r1, [r5] adds r1, r6 @@ -148796,7 +148796,7 @@ dp01t_08_1_8032428: ; 805B864 asrs r2, 16 movs r1, 0x50 movs r3, 0x1E - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r6, =0x020241e4 ldrb r1, [r5] adds r1, r6 @@ -148924,7 +148924,7 @@ sub_805B9F8: ; 805B9F8 lsls r0, 2 adds r0, r4 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 @@ -150802,9 +150802,9 @@ dp01t_2F_1_pokemon_enter: ; 805CA80 lsls r0, 2 adds r0, r5 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =0x0000d6f8 - bl gpu_pal_alloc_new + bl AllocObjectPalette adds r4, r0, 0 lsls r4, 24 ldr r1, =gTrainerBackPicPaletteTable @@ -150895,12 +150895,12 @@ sub_805CC00: ; 805CC00 bl obj_free_rotscale_entry ldrb r0, [r5, 0x5] lsrs r0, 4 - bl gpu_pal_tag_by_index + bl GetObjectPaletteTagBySlot lsls r0, 16 lsrs r0, 16 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag adds r0, r5, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -150920,7 +150920,7 @@ sub_805CC00: ; 805CC00 ldr r1, =0x02020630 adds r0, r1 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim pop {r4,r5} pop {r0} bx r0 @@ -152237,7 +152237,7 @@ sub_805D770: ; 805D770 bl sub_8008258 @0805D7A0: adds r0, r4, 0 - bl obj_anim_step + bl AnimateObject pop {r4} pop {r0} bx r0 @@ -152841,7 +152841,7 @@ sub_805DC0C: ; 805DC0C adds r0, r2, 0 adds r2, r5, 0 adds r3, r6, 0 - bl sub_8034B50 + bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack mov r3, r8 lsls r2, r3, 4 movs r0, 0x80 @@ -152871,7 +152871,7 @@ sub_805DC0C: ; 805DC0C ldr r4, =0x0201c000 adds r0, r6, 0 adds r1, r4, 0 - bl call_LZZUnCompWram + bl LZDecompressWram adds r0, r4, 0 adds r1, r7, 0 movs r2, 0x20 @@ -152893,7 +152893,7 @@ sub_805DC0C: ; 805DC0C lsls r4, 1 adds r1, r4 adds r0, r6, 0 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r0, =0x020244e4 add r0, r8 ldrb r1, [r0] @@ -153012,7 +153012,7 @@ sub_805DD7C: ; 805DD7C ldr r1, [r1] adds r2, r5, 0 adds r3, r4, 0 - bl sub_8034B50 + bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack b @0805DE46 .pool @0805DE2C: @@ -153027,7 +153027,7 @@ sub_805DD7C: ; 805DD7C ldr r1, [r1] adds r2, r5, 0 adds r3, r4, 0 - bl sub_8034628 + bl DecompressMonPic_DetectFrontOrBack @0805DE46: mov r2, r8 lsls r1, r2, 4 @@ -153056,7 +153056,7 @@ sub_805DD7C: ; 805DD7C ldr r4, =0x0201c000 adds r0, r6, 0 adds r1, r4, 0 - bl call_LZZUnCompWram + bl LZDecompressWram adds r0, r4, 0 adds r1, r7, 0 movs r2, 0x20 @@ -153078,7 +153078,7 @@ sub_805DD7C: ; 805DD7C lsls r4, 1 adds r1, r4 adds r0, r6, 0 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r0, =0x020244e4 add r0, r8 ldrb r1, [r0] @@ -153153,11 +153153,11 @@ sub_805DF38: ; 805DF38 ldr r1, [r1] adds r0, r2, 0 movs r2, 0 - bl LZ77UnCompAnyRam + bl DecompressPicFromTable_2 ldr r0, =gTrainerFrontPicPaletteTable adds r4, r0 adds r0, r4, 0 - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette pop {r4} pop {r0} bx r0 @@ -153187,7 +153187,7 @@ sub_805DF84: ; 805DF84 ldr r1, [r1] adds r0, r2, 0 movs r2, 0 - bl LZ77UnCompAnyRam + bl DecompressPicFromTable_2 ldr r0, =gTrainerBackPicPaletteTable adds r5, r0 ldr r0, [r5] @@ -153218,7 +153218,7 @@ sub_805DFE4: ; 805DFE4 lsrs r0, 13 adds r0, r1 ldrh r0, [r0, 0x4] - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag pop {r0} bx r0 .pool @@ -153229,34 +153229,34 @@ sub_805DFFC: ; 805DFFC push {r4-r7,lr} ldr r4, =gUnknown_0832C128 adds r0, r4, 0 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette adds r4, 0x8 adds r0, r4, 0 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette bl battle_type_is_double lsls r0, 24 cmp r0, 0 bne @0805E034 ldr r0, =gUnknown_0832C0D0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_0832C0D8 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic movs r5, 0x2 b @0805E056 .pool @0805E034: ldr r4, =gUnknown_0832C0E0 adds r0, r4, 0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic adds r4, 0x8 adds r0, r4, 0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r4, =gUnknown_0832C0F0 adds r0, r4, 0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic adds r4, 0x8 adds r0, r4, 0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic movs r5, 0x4 @0805E056: movs r4, 0 @@ -153269,7 +153269,7 @@ sub_805DFFC: ; 805DFFC ldrb r0, [r0] lsls r0, 3 adds r0, r6 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -153297,10 +153297,10 @@ sub_805E08C: ; 805E08C bne @0805E0B8 ldr r4, =gUnknown_0832C128 adds r0, r4, 0 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette adds r4, 0x8 adds r0, r4, 0 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette b @0805E1AE .pool @0805E0B8: @@ -153317,19 +153317,19 @@ sub_805E08C: ; 805E08C cmp r0, 0 beq @0805E0E4 ldr r0, =gUnknown_0832C100 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic b @0805E1AE .pool @0805E0E4: ldr r0, =gUnknown_0832C0D0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic b @0805E1AE .pool @0805E0F0: cmp r4, 0x3 bne @0805E100 ldr r0, =gUnknown_0832C0D8 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic b @0805E1AE .pool @0805E100: @@ -153350,28 +153350,28 @@ sub_805E08C: ; 805E08C cmp r4, 0x2 bne @0805E130 ldr r0, =gUnknown_0832C0E0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic b @0805E1AE .pool @0805E130: cmp r4, 0x3 bne @0805E140 ldr r0, =gUnknown_0832C0E8 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic b @0805E1AE .pool @0805E140: cmp r4, 0x4 bne @0805E150 ldr r0, =gUnknown_0832C0F0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic b @0805E1AE .pool @0805E150: cmp r4, 0x5 bne @0805E160 ldr r0, =gUnknown_0832C0F8 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic b @0805E1AE .pool @0805E160: @@ -153404,7 +153404,7 @@ sub_805E08C: ; 805E08C lsls r0, 3 ldr r1, =gUnknown_0832C108 adds r0, r1 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic b @0805E1AE .pool @0805E1AC: @@ -153426,7 +153426,7 @@ load_gfxc_health_bar: ; 805E1B8 lsls r2, 1 adds r1, r2 ldr r1, [r1] - bl call_LZZUnCompWram + bl LZDecompressWram pop {r0} bx r0 .pool @@ -153750,7 +153750,7 @@ sub_805E448: ; 805E448 ldr r1, [r4] ldr r1, [r1, 0x8] ldrb r1, [r1] - bl obj_anim_image_start + bl StartObjectImageAnim lsls r0, r7, 20 movs r2, 0x80 lsls r2, 17 @@ -153908,7 +153908,7 @@ sub_805E448: ; 805E448 ldr r3, [r2] @0805E5FA: mov r2, r8 - bl sub_8034B50 + bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack b @0805E662 .pool @0805E618: @@ -153945,7 +153945,7 @@ sub_805E448: ; 805E448 adds r2, r3 ldr r3, [r2] mov r2, r8 - bl sub_8034B50 + bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack @0805E662: ldr r0, =0x020244d4 ldr r0, [r0] @@ -153986,7 +153986,7 @@ sub_805E448: ; 805E448 mov r9, r0 ldr r4, =0x0201c000 adds r1, r4, 0 - bl call_LZZUnCompWram + bl LZDecompressWram adds r0, r4, 0 adds r1, r6, 0 movs r2, 0x20 @@ -154014,7 +154014,7 @@ sub_805E448: ; 805E448 lsls r4, 1 adds r1, r4 mov r0, r9 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r0, =0x020244e4 ldr r1, [sp] adds r0, r1, r0 @@ -154078,7 +154078,7 @@ sub_805E448: ; 805E448 ldr r1, =0x020244e4 adds r1, r7, r1 ldrb r1, [r1] - bl obj_anim_image_start + bl StartObjectImageAnim @0805E77A: add sp, 0x4 pop {r3-r5} @@ -154133,7 +154133,7 @@ sub_805E7DC: ; 805E7DC adds r1, 0x4 adds r1, r4 ldr r1, [r1] - bl call_LZZUnCompVram + bl LZDecompressVram b @0805E84E .pool @0805E83C: @@ -154144,7 +154144,7 @@ sub_805E7DC: ; 805E7DC adds r1, 0x4 adds r1, r4 ldr r1, [r1] - bl call_LZZUnCompVram + bl LZDecompressVram @0805E84E: movs r3, 0x1 lsls r6, r5, 4 @@ -154237,7 +154237,7 @@ refresh_graphics_maybe: ; 805E8F4 adds r0, r6, r0 ldrb r1, [r0] adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim cmp r5, 0 bne @0805E938 adds r0, r6, 0 @@ -154662,7 +154662,7 @@ sub_805EC84: ; 805EC84 mov r7, r8 push {r7} ldr r0, =gUnknown_0831C6A0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic movs r0, 0x1 bl battle_get_side_with_given_state adds r5, r0, 0 @@ -154689,7 +154689,7 @@ sub_805EC84: ; 805EC84 mov r0, r8 adds r1, r4, 0 movs r3, 0xC8 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r6, =0x020244d0 ldr r1, [r6] ldr r2, [r1, 0x4] @@ -154736,7 +154736,7 @@ sub_805EC84: ; 805EC84 mov r0, r8 adds r1, r4, 0 movs r3, 0xC8 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r6] ldr r2, [r1, 0x4] lsls r1, r5, 1 @@ -155413,7 +155413,7 @@ sub_805F240: ; 805F240 adds r0, r1 lsls r0, 2 adds r0, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles bl dp01_tbl7_exec_completed @0805F292: pop {r4-r6} @@ -155644,9 +155644,9 @@ sub_805F2F0: ; 805F2F0 strb r4, [r0, 0x1] ldr r4, =0x000027f9 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag b @0805F51A .pool @0805F494: @@ -155684,9 +155684,9 @@ sub_805F2F0: ; 805F2F0 bne @0805F53C ldr r4, =0x000027f9 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag @0805F4E4: mov r1, r8 ldr r0, [r1] @@ -156127,7 +156127,7 @@ sub_805F560: ; 805F560 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldrb r0, [r5] eors r4, r0 ldr r1, =0x0202406e @@ -156156,7 +156156,7 @@ sub_805F560: ; 805F560 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldrb r5, [r4] ldr r1, =0x0202406e lsls r0, r5, 1 @@ -156307,9 +156307,9 @@ sub_805F994: ; 805F994 strb r0, [r1, 0x1] ldr r4, =0x000027f9 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag bl dp01_tbl7_exec_completed @0805FA48: pop {r4,r5} @@ -156419,7 +156419,7 @@ sub_805FB08: ; 805FB08 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldrb r0, [r6] bl sub_805EEE0 ldr r1, =0x03005d70 @@ -156657,9 +156657,9 @@ sub_805FD00: ; 805FD00 strb r0, [r1, 0x1] ldr r4, =0x000027f9 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag ldrb r0, [r5] adds r0, r6 ldrb r1, [r0] @@ -156668,7 +156668,7 @@ sub_805FD00: ; 805FD00 lsls r0, 2 adds r0, r7 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r4, =0x03005d70 ldrb r1, [r5] adds r0, r1, r4 @@ -156758,7 +156758,7 @@ sub_805FDF0: ; 805FDF0 cmp r0, 0 bne @0805FE8C adds r0, r3, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldrb r4, [r5] ldr r1, =0x0202406e lsls r0, r4, 1 @@ -159026,7 +159026,7 @@ sub_8061224: ; 8061224 mov r0, r9 adds r1, r5, 0 adds r2, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r4, =0x020241e4 ldrb r1, [r6] adds r1, r4 @@ -159081,7 +159081,7 @@ sub_8061224: ; 8061224 ldr r1, =0x020244e4 adds r2, r1 ldrb r1, [r2] - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r4, [r6] lsls r0, r4, 1 ldr r2, =0x0202406e @@ -159230,7 +159230,7 @@ sub_80613DC: ; 80613DC mov r0, r9 adds r1, r5, 0 adds r2, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r4, =0x020241e4 adds r4, r6, r4 strb r0, [r4] @@ -159282,7 +159282,7 @@ sub_80613DC: ; 80613DC ldr r1, =0x020244e4 adds r6, r1 ldrb r1, [r6] - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -159369,7 +159369,7 @@ sub_806156C: ; 806156C adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldrb r0, [r6] bl sub_805EEE0 ldr r1, =0x03005d70 @@ -159626,7 +159626,7 @@ sub_8061690: ; 8061690 adds r0, r6, 0 mov r1, r9 adds r2, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r6, =0x020241e4 ldrb r1, [r5] adds r1, r6 @@ -159655,7 +159655,7 @@ sub_8061690: ; 8061690 lsls r0, r2, 3 adds r0, r1 ldrh r0, [r0, 0x4] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag ldrb r1, [r5] adds r1, r6 ldrb r1, [r1] @@ -159845,7 +159845,7 @@ sub_80618D8: ; 80618D8 asrs r2, 16 movs r1, 0xB0 movs r3, 0x1E - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r5, =0x020241e4 ldrb r1, [r6] adds r1, r5 @@ -159884,7 +159884,7 @@ sub_80618D8: ; 80618D8 lsls r0, r2, 3 adds r0, r1 ldrh r0, [r0, 0x4] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag ldrb r1, [r6] adds r1, r5 ldrb r1, [r1] @@ -161485,7 +161485,7 @@ sub_806280C: ; 806280C adds r0, r4, 0 bl obj_free_rotscale_entry adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles pop {r4} pop {r0} bx r0 @@ -164918,7 +164918,7 @@ sub_8064470: ; 8064470 adds r0, r1 lsls r0, 2 adds r0, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles bl sub_8065068 @080644C2: pop {r4-r6} @@ -165130,9 +165130,9 @@ sub_8064520: ; 8064520 strb r4, [r0, 0x1] ldr r4, =0x000027f9 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag b @080646F2 .pool @0806469C: @@ -165173,9 +165173,9 @@ sub_8064520: ; 8064520 bne @080646F2 ldr r4, =0x000027f9 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag @080646F2: ldr r0, =0x020244d0 ldr r0, [r0] @@ -165554,7 +165554,7 @@ sub_8064734: ; 8064734 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldrb r0, [r5] eors r4, r0 ldr r1, =0x0202406e @@ -165583,7 +165583,7 @@ sub_8064734: ; 8064734 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldrb r5, [r4] ldr r1, =0x0202406e lsls r0, r5, 1 @@ -165718,9 +165718,9 @@ sub_8064B04: ; 8064B04 strb r0, [r1, 0x1] ldr r4, =0x000027f9 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag bl sub_8065068 @08064BB6: pop {r4-r7} @@ -165830,7 +165830,7 @@ sub_8064C58: ; 8064C58 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldrb r0, [r6] bl sub_805EEE0 ldr r1, =0x03005d70 @@ -166068,9 +166068,9 @@ sub_8064E50: ; 8064E50 strb r0, [r1, 0x1] ldr r4, =0x000027f9 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag ldrb r0, [r5] adds r0, r6 ldrb r1, [r0] @@ -166079,7 +166079,7 @@ sub_8064E50: ; 8064E50 lsls r0, 2 adds r0, r7 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r4, =0x03005d70 ldrb r1, [r5] adds r0, r1, r4 @@ -166169,7 +166169,7 @@ sub_8064F40: ; 8064F40 cmp r0, 0 bne @08064FDC adds r0, r3, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldrb r4, [r5] ldr r1, =0x0202406e lsls r0, r4, 1 @@ -168384,7 +168384,7 @@ sub_80662F8: ; 80662F8 mov r0, r8 adds r1, r5, 0 adds r2, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r4, =0x020241e4 ldrb r1, [r6] adds r1, r4 @@ -168430,7 +168430,7 @@ sub_80662F8: ; 80662F8 ldr r1, =0x020244e4 adds r2, r1 ldrb r1, [r2] - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r4, [r6] lsls r0, r4, 1 adds r0, r7 @@ -168573,7 +168573,7 @@ sub_8066494: ; 8066494 mov r0, r9 adds r1, r5, 0 adds r2, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r4, =0x020241e4 adds r4, r6, r4 strb r0, [r4] @@ -168625,7 +168625,7 @@ sub_8066494: ; 8066494 ldr r1, =0x020244e4 adds r6, r1 ldrb r1, [r6] - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -168712,7 +168712,7 @@ sub_8066624: ; 8066624 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldrb r0, [r6] bl sub_805EEE0 ldr r1, =0x03005d70 @@ -169075,7 +169075,7 @@ sub_8066748: ; 8066748 adds r0, r6, 0 mov r1, r9 adds r2, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r6, =0x020241e4 ldrb r1, [r5] adds r1, r6 @@ -169104,7 +169104,7 @@ sub_8066748: ; 8066748 lsls r0, r2, 3 adds r0, r1 ldrh r0, [r0, 0x4] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag ldrb r1, [r5] adds r1, r6 ldrb r1, [r1] @@ -169197,7 +169197,7 @@ sub_8066A58: ; 8066A58 asrs r2, 16 movs r1, 0xB0 movs r3, 0x1E - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r5, =0x020241e4 ldrb r1, [r6] adds r1, r5 @@ -169236,7 +169236,7 @@ sub_8066A58: ; 8066A58 lsls r0, r2, 3 adds r0, r1 ldrh r0, [r0, 0x4] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag ldrb r1, [r6] adds r1, r5 ldrb r1, [r1] @@ -170638,7 +170638,7 @@ sub_80676FC: ; 80676FC adds r0, r4, 0 bl obj_free_rotscale_entry adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles pop {r4} pop {r0} bx r0 @@ -185417,7 +185417,7 @@ sub_806ED40: ; 806ED40 beq @0806EDA6 adds r0, r5, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim @0806EDA6: ldr r0, =gUnknown_08329B87 subs r4, 0x1 @@ -185478,7 +185478,7 @@ sub_806EE0C: ; 806EE0C beq @0806EE2E adds r0, r5, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim @0806EE2E: ldr r0, =gUnknown_08329B87 subs r4, 0x1 @@ -186575,7 +186575,7 @@ object_new_hidden_with_callback: ; 806F640 movs r1, 0xF8 movs r2, 0xA8 movs r3, 0xE - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r5, =0x02020630 @@ -190693,10 +190693,10 @@ sub_807163C: ; 807163C adds r2, r1 ldr r1, [r2] adds r2, r4, 0 - bl sub_8034B50 + bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack adds r0, r5, 0 bl sub_806E794 - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette mov r0, r9 strh r4, [r0] b @08071712 @@ -190711,7 +190711,7 @@ sub_807163C: ; 807163C movs r1, 0x78 movs r2, 0x4B movs r3, 0x6 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 ldr r4, =0x02020630 @@ -190742,8 +190742,8 @@ sub_807163C: ; 807163C thumb_func_start sub_807172C sub_807172C: ; 807172C push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -190873,17 +190873,17 @@ c1_hatching_egg: ; 80717A0 bl Alloc adds r1, r0, 0 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap movs r0, 0x80 lsls r0, 6 bl Alloc adds r1, r0, 0 movs r0, 0 - bl SetBgTileMap + bl SetBgTilemap bl DeactivateAllTextPrinters bl sub_80A1A74 - bl gpu_pal_allocator_reset - bl reset_all_obj_data + bl ResetObjectPaletteAllocator + bl ResetAllObjectData bl clear_tasks bl remove_some_task bl SoundVSyncOn_rev01 @@ -190909,7 +190909,7 @@ c1_hatching_egg: ; 80717A0 movs r0, 0 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer ldr r0, =gUnknown_08C004E0 movs r1, 0 movs r2, 0x20 @@ -190918,16 +190918,16 @@ c1_hatching_egg: ; 80717A0 .pool @08071904: ldr r0, =gUnknown_0832BFE4 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, =gUnknown_0832BFEC - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, =gUnknown_0832BFF4 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette b @080719A6 .pool @08071924: movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, =0x03000de0 ldr r0, [r0] ldrb r0, [r0, 0x4] @@ -190976,9 +190976,9 @@ c1_hatching_egg: ; 80717A0 lsls r2, 5 movs r0, 0x1 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @080719A6: ldr r1, =0x030022c0 movs r0, 0x87 @@ -190999,8 +190999,8 @@ c1_hatching_egg: ; 80717A0 @080719D6: bl run_active_tasks bl RunTextPrinters - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably add sp, 0x4 pop {r4} @@ -191123,7 +191123,7 @@ sub_8071A94: ; 8071A94 movs r1, 0x78 movs r2, 0x4B movs r3, 0x5 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r4, =0x03000de0 ldr r1, [r4] strb r0, [r1] @@ -191274,7 +191274,7 @@ sub_8071A94: ; 8071A94 strb r0, [r1, 0x2] ldr r0, [r5] ldrb r0, [r0, 0x8] - bl PutWindowTileMap + bl PutWindowTilemap ldr r0, [r5] ldrb r0, [r0, 0x8] movs r1, 0x3 @@ -191440,9 +191440,9 @@ sub_8071A94: ; 8071A94 ldrb r0, [r0, 0x8] bl RemoveWindow movs r0, 0 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0x1 - bl UnsetBgTileMap + bl UnsetBgTilemap ldr r0, [r4] bl Free ldr r0, =c2_exit_to_overworld_2_switch @@ -191450,8 +191450,8 @@ sub_8071A94: ; 8071A94 @08071E06: bl run_active_tasks bl RunTextPrinters - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably add sp, 0x8 pop {r3,r4} @@ -191499,7 +191499,7 @@ sub_8071E34: ; 8071E34 bl audio_play adds r0, r4, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim bl sub_8072140 @08071E84: pop {r4} @@ -191551,7 +191551,7 @@ sub_8071E8C: ; 8071E8C bl audio_play adds r0, r4, 0 movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim @08071EE8: pop {r4} pop {r0} @@ -191624,7 +191624,7 @@ sub_8071EF0: ; 8071EF0 bl audio_play adds r0, r4, 0 movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim bl sub_8072140 bl sub_8072140 @08071F90: @@ -191845,7 +191845,7 @@ sub_80720E8: ; 80720E8 cmp r0, 0 ble @0807213A adds r0, r2, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0807213A: pop {r4} pop {r0} @@ -191930,7 +191930,7 @@ sub_8072194: ; 8072194 adds r1, r4, 0 adds r2, r5, 0 movs r3, 0x4 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -191945,7 +191945,7 @@ sub_8072194: ; 8072194 mov r1, r9 strh r1, [r0, 0x34] mov r1, r10 - bl obj_anim_image_start + bl StartObjectImageAnim pop {r3-r5} mov r8, r3 mov r9, r4 @@ -192365,14 +192365,14 @@ battle_make_oam_normal_battle: ; 80724DC movs r1, 0xF0 movs r2, 0xA0 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r6, r0, 24 adds r0, r4, 0 movs r1, 0xF0 movs r2, 0xA0 movs r3, 0x1 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r7, r0, 24 ldr r4, =0x02020630 @@ -192411,14 +192411,14 @@ battle_make_oam_normal_battle: ; 80724DC movs r1, 0xF0 movs r2, 0xA0 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r6, r0, 24 adds r0, r4, 0 movs r1, 0xF0 movs r2, 0xA0 movs r3, 0x1 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r7, r0, 24 ldr r0, =0x02020630 @@ -192476,7 +192476,7 @@ battle_make_oam_normal_battle: ; 80724DC movs r1, 0xF0 movs r2, 0xA0 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r6, r0, 24 mov r0, r10 @@ -192491,7 +192491,7 @@ battle_make_oam_normal_battle: ; 80724DC movs r1, 0xF0 movs r2, 0xA0 movs r3, 0x1 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r7, r0, 24 ldr r4, =0x02020630 @@ -192540,7 +192540,7 @@ battle_make_oam_normal_battle: ; 80724DC movs r1, 0xF0 movs r2, 0xA0 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r6, r0, 24 mov r0, r10 @@ -192555,7 +192555,7 @@ battle_make_oam_normal_battle: ; 80724DC movs r1, 0xF0 movs r2, 0xA0 movs r3, 0x1 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r7, r0, 24 ldr r4, =0x02020630 @@ -192602,7 +192602,7 @@ battle_make_oam_normal_battle: ; 80724DC movs r1, 0x8C movs r2, 0x3C movs r3, 0 - bl obj_add_from_template_backward_search + bl AddObjectToBack adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 @@ -192620,7 +192620,7 @@ battle_make_oam_normal_battle: ; 80724DC ldr r0, =gUnknown_0832C28C adds r1, r0 adds r0, r4, 0 - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable adds r2, r4, 0 adds r2, 0x42 ldrb r1, [r2] @@ -192698,7 +192698,7 @@ battle_make_oam_safari_battle: ; 8072804 movs r1, 0xF0 movs r2, 0xA0 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 @@ -192706,7 +192706,7 @@ battle_make_oam_safari_battle: ; 8072804 movs r1, 0xF0 movs r2, 0xA0 movs r3, 0x1 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 ldr r1, =0x02020630 @@ -192997,16 +192997,16 @@ sub_8072A44: ; 8072A44 adds r0, r1 lsls r0, 2 adds r0, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0x38 ldrsh r1, [r4, r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles pop {r4,r5} pop {r0} bx r0 @@ -194409,13 +194409,13 @@ sub_80735DC: ; 80735DC mov r8, r3 @0807366C: ldr r0, =gUnknown_0832C334 - bl gpu_tile_obj_decompress_and_load3 + bl LoadCompressedObjectPicUsingHeap ldr r0, =gUnknown_0832C34C - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, =gUnknown_0832C33C - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette ldr r0, =gUnknown_0832C344 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette mov r0, r9 lsls r6, r0, 1 adds r0, r6, r0 @@ -194427,7 +194427,7 @@ sub_80735DC: ; 80735DC lsls r4, 16 asrs r2, r4, 16 movs r3, 0xA - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x14] @@ -194439,7 +194439,7 @@ sub_80735DC: ; 80735DC adds r7, r0, r1 ldr r1, =gUnknown_0832C2C4 adds r0, r7, 0 - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable mov r2, r10 strh r2, [r7, 0x24] mov r3, r8 @@ -194488,7 +194488,7 @@ sub_80735DC: ; 80735DC asrs r1, r3, 16 asrs r2, 16 movs r3, 0x9 - bl obj_add_from_template_backward_search + bl AddObjectToBack strb r0, [r7] ldr r0, [sp, 0x10] cmp r0, 0 @@ -195288,7 +195288,7 @@ sub_8073C30: ; 8073C30 ldr r1, =sub_8074090 str r1, [r3] ldr r1, =gUnknown_0832C2CC - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable ldr r1, =0x03005e00 ldr r0, [sp, 0xC] add r0, r8 @@ -195427,14 +195427,14 @@ sub_8073E64: ; 8073E64 lsls r0, 2 ldr r4, =0x02020630 adds r0, r4 - bl obj_delete_and_free_resources + bl RemoveObjectAndFreeResources mov r0, sp ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_resources + bl RemoveObjectAndFreeResources b @08073F32 .pool @08073EFC: @@ -195446,7 +195446,7 @@ sub_8073E64: ; 8073E64 adds r0, r4, 0 bl obj_free_rotscale_entry adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles mov r0, sp ldrb r1, [r0] lsls r0, r1, 4 @@ -195460,7 +195460,7 @@ sub_8073E64: ; 8073E64 adds r0, r1 lsls r0, 2 adds r0, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08073F32: movs r4, 0x1 ldr r5, =0x02020630 @@ -195472,7 +195472,7 @@ sub_8073E64: ; 8073E64 adds r0, r1 lsls r0, 2 adds r0, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r4, 0x1 cmp r4, 0x5 ble @08073F36 @@ -195565,14 +195565,14 @@ sub_8073F98: ; 8073F98 lsls r0, 2 ldr r4, =0x02020630 adds r0, r4 - bl obj_delete_and_free_resources + bl RemoveObjectAndFreeResources mov r0, sp ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_resources + bl RemoveObjectAndFreeResources movs r5, 0x1 @08074016: mov r1, sp @@ -195582,7 +195582,7 @@ sub_8073F98: ; 8073F98 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r5, 0x1 cmp r5, 0x5 ble @08074016 @@ -197823,15 +197823,15 @@ sub_807521C: ; 807521C lsrs r4, r2, 24 ldr r5, =gUnknown_0831C620 ldrh r0, [r5, 0x6] - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 bne @0807524E adds r0, r5, 0 - bl gpu_tile_obj_decompress_and_load3 + bl LoadCompressedObjectPicUsingHeap ldr r0, =gUnknown_0831C628 - bl gpu_pal_obj_decompress_and_apply3 + bl LoadCompressedObjectPaletteUsingHeap @0807524E: ldr r0, =sub_8075370 bl object_new_hidden_with_callback @@ -197862,7 +197862,7 @@ sub_807521C: ; 807521C adds r1, r6, 0 adds r2, r4, 0 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -197876,12 +197876,12 @@ sub_807521C: ; 807521C adds r0, 0x1 strh r0, [r5, 0x2E] adds r0, r1, 0 - bl obj_anim_step + bl AnimateObject mov r0, r9 mov r1, r10 adds r2, r4, 0 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r4, r0, 4 @@ -197896,14 +197896,14 @@ sub_807521C: ; 807521C strh r0, [r5, 0x2E] adds r0, r4, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r4, 0 - bl obj_anim_step + bl AnimateObject mov r0, r9 adds r1, r6, 0 adds r2, r7, 0 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r4, r0, 4 @@ -197918,14 +197918,14 @@ sub_807521C: ; 807521C strh r0, [r5, 0x2E] adds r0, r4, 0 movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r4, 0 - bl obj_anim_step + bl AnimateObject mov r0, r9 mov r1, r10 adds r2, r7, 0 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r4, r0, 4 @@ -197940,9 +197940,9 @@ sub_807521C: ; 807521C strh r0, [r5, 0x2E] adds r0, r4, 0 movs r1, 0x3 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r4, 0 - bl obj_anim_step + bl AnimateObject mov r0, r8 pop {r3-r5} mov r8, r3 @@ -197964,16 +197964,16 @@ sub_8075370: ; 8075370 bne @080753A8 ldr r0, =gUnknown_0831C620 ldrh r0, [r0, 0x6] - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag ldr r0, =gUnknown_0831C628 ldrh r0, [r0, 0x4] - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag movs r1, 0x30 ldrsh r0, [r4, r1] cmp r0, 0 bne @080753A4 adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles b @080753A8 .pool @080753A4: @@ -198007,7 +198007,7 @@ sub_80753B4: ; 80753B4 subs r1, 0x1 strh r1, [r0, 0x2E] adds r0, r3, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @080753DE: pop {r0} bx r0 @@ -198134,7 +198134,7 @@ sub_8075450: ; 8075450 movs r1, 0x20 movs r2, 0x50 movs r3, 0x1D - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 ldr r2, =0x02020630 @@ -198283,7 +198283,7 @@ objc_0804ABD4: ; 8075620 mov r8, r0 adds r0, r7, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim adds r2, r7, 0 adds r2, 0x2C ldrb r0, [r2] @@ -198389,7 +198389,7 @@ sub_80756E0: ; 80756E0 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_anim_step + bl AnimateObject movs r1, 0x3A ldrsh r0, [r6, r1] adds r0, r5 @@ -198438,7 +198438,7 @@ sub_807574C: ; 807574C bge @080757BC adds r0, r4, 0 movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim movs r2, 0x3A ldrsh r0, [r4, r2] adds r0, r5 @@ -199129,7 +199129,7 @@ sub_8075D14: ; 8075D14 lsrs r5, r0, 24 adds r0, r6, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r5, 0 bl sub_8076B14 lsls r0, 16 @@ -199385,7 +199385,7 @@ sub_8075D14: ; 8075D14 lsls r0, 2 ldr r4, =0x02020630 adds r0, r4 - bl obj_anim_step + bl AnimateObject movs r1, 0x3A ldrsh r0, [r6, r1] adds r0, r5 @@ -199532,7 +199532,7 @@ sub_8075FD4: ; 8075FD4 adds r0, r5, 0 bl obj_free_rotscale_entry adds r0, r5, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r3, 0 ldr r0, [r4] ldr r2, [r0, 0x4] @@ -199617,9 +199617,9 @@ sub_80760F8: ; 80760F8 adds r0, r1 lsls r0, 2 adds r0, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r6, 0 - bl obj_delete_and_free_resources + bl RemoveObjectAndFreeResources ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -200006,14 +200006,14 @@ sub_8076438: ; 8076438 lsls r0, r2, 16 lsrs r7, r0, 16 ldr r0, =gUnknown_0832C400 - bl gpu_tile_obj_decompress_and_load3 + bl LoadCompressedObjectPicUsingHeap ldr r0, =gUnknown_0832C460 - bl gpu_pal_obj_decompress_and_apply3 + bl LoadCompressedObjectPaletteUsingHeap ldr r0, =gUnknown_0832C588 mov r1, r9 mov r2, r10 adds r3, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r1, =0x02020630 @@ -200114,7 +200114,7 @@ sub_8076524: ; 8076524 @08076560: adds r0, r6, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r0, [r6, 0x20] lsls r0, 24 lsrs r0, 24 @@ -200153,7 +200153,7 @@ sub_8076524: ; 8076524 movs r1, 0x1 bl sub_8008258 adds r0, r4, 0 - bl obj_anim_step + bl AnimateObject movs r0, 0x80 lsls r0, 5 strh r0, [r4, 0x30] @@ -200322,7 +200322,7 @@ sub_80765E0: ; 80765E0 bl sub_806ED40 @08076708: adds r0, r4, 0 - bl obj_delete_and_free_resources + bl RemoveObjectAndFreeResources @0807670E: pop {r3,r4} mov r8, r3 @@ -200367,14 +200367,14 @@ sub_807671C: ; 807671C lsrs r0, 24 mov r9, r0 ldr r0, =gUnknown_0832C400 - bl gpu_tile_obj_decompress_and_load3 + bl LoadCompressedObjectPicUsingHeap ldr r0, =gUnknown_0832C460 - bl gpu_pal_obj_decompress_and_apply3 + bl LoadCompressedObjectPaletteUsingHeap ldr r0, =gUnknown_0832C588 adds r1, r6, 0 mov r2, r8 adds r3, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r6, =0x02020630 @@ -200452,7 +200452,7 @@ sub_80767D4: ; 80767D4 @08076810: adds r0, r4, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r0, [r4, 0x20] lsls r0, 24 lsrs r0, 24 @@ -200484,7 +200484,7 @@ sub_80767D4: ; 80767D4 movs r1, 0x2 bl sub_8008258 adds r0, r4, 0 - bl obj_anim_step + bl AnimateObject strh r5, [r4, 0x30] b @08076870 .pool @@ -200529,7 +200529,7 @@ sub_807687C: ; 807687C bge @080768D8 adds r0, r5, 0 movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] @@ -200578,7 +200578,7 @@ sub_80768F0: ; 80768F0 thumb_func_start obj_delete_and_free_associated_resources_ obj_delete_and_free_associated_resources_: ; 807690C push {lr} - bl obj_delete_and_free_resources + bl RemoveObjectAndFreeResources pop {r0} bx r0 thumb_func_end obj_delete_and_free_associated_resources_ @@ -200753,7 +200753,7 @@ oamc_804BEB4: ; 8076A38 strh r2, [r1, 0x24] strh r2, [r1, 0x26] adds r0, r3, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08076A70: pop {r0} bx r0 @@ -200769,16 +200769,16 @@ sub_8076A78: ; 8076A78 lsls r6, r4, 3 adds r5, r6, r0 ldrh r0, [r5, 0x6] - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 bne @08076AA0 adds r0, r5, 0 - bl gpu_tile_obj_decompress_and_load3 + bl LoadCompressedObjectPicUsingHeap ldr r0, =gUnknown_0832C460 adds r0, r6, r0 - bl gpu_pal_obj_decompress_and_apply3 + bl LoadCompressedObjectPaletteUsingHeap @08076AA0: cmp r4, 0x6 beq @08076ACC @@ -200793,14 +200793,14 @@ sub_8076A78: ; 8076A78 lsls r0, r4, 3 adds r0, r1 ldrh r0, [r0, 0x6] - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag adds r1, r0, 0 lsls r1, 16 ldr r0, =gUnknown_08C02300 lsrs r1, 11 ldr r2, =0x06010100 adds r1, r2 - bl call_LZZUnCompVram + bl LZDecompressVram @08076ACC: pop {r4-r6} pop {r0} @@ -200817,11 +200817,11 @@ sub_8076AE8: ; 8076AE8 lsrs r4, 21 adds r0, r4, r0 ldrh r0, [r0, 0x6] - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag ldr r0, =gUnknown_0832C460 adds r4, r0 ldrh r0, [r4, 0x4] - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag pop {r4} pop {r0} bx r0 @@ -201785,8 +201785,8 @@ sub_8077294: ; 8077294 sub_80772A4: ; 80772A4 push {r4,r5,lr} sub sp, 0xC - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator bl clear_tasks bl sub_80A1A74 ldr r2, =0x02037fd4 @@ -201817,7 +201817,7 @@ sub_80772A4: ; 80772A4 lsls r0, 4 adds r1, r0 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r0, =gUnknown_0832DEF4 bl InitWindows lsls r0, 16 @@ -201829,7 +201829,7 @@ sub_80772A4: ; 80772A4 lsls r4, r5, 24 lsrs r4, 24 adds r0, r4, 0 - bl ClearWindowTileMap + bl ClearWindowTilemap adds r0, r4, 0 movs r1, 0 bl FillWindowPixelBuffer @@ -201846,7 +201846,7 @@ sub_80772A4: ; 80772A4 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r0, 0 movs r1, 0x14 movs r2, 0xC0 @@ -202447,7 +202447,7 @@ sub_80773D0: ; 80773D0 add r0, sp, 0x10 movs r2, 0xA movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r4, 0x20 adds r6, 0x1 cmp r6, 0x2 @@ -202485,7 +202485,7 @@ sub_80773D0: ; 80773D0 add r0, sp, 0x10 movs r2, 0xA movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r4, 0x20 adds r6, 0x1 cmp r6, 0x2 @@ -202513,7 +202513,7 @@ sub_80773D0: ; 80773D0 movs r1, 0xD7 movs r2, 0x98 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront add r0, sp, 0x10 ldm r4!, {r3,r5,r7} stm r0!, {r3,r5,r7} @@ -202528,7 +202528,7 @@ sub_80773D0: ; 80773D0 movs r1, 0xF7 movs r2, 0x98 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront movs r6, 0 add r4, sp, 0x10 movs r5, 0xC0 @@ -202549,7 +202549,7 @@ sub_80773D0: ; 80773D0 add r0, sp, 0x10 movs r2, 0x96 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront movs r0, 0x80 lsls r0, 14 adds r5, r0 @@ -202567,7 +202567,7 @@ sub_80773D0: ; 80773D0 ldrb r2, [r2, 0x1] lsls r2, 3 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r2, =0x0203229c ldr r1, [r2] adds r1, 0x34 @@ -202701,8 +202701,8 @@ sub_80773D0: ; 80773D0 @08077B46: bl RunTextPrinters bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably add sp, 0x28 pop {r3} @@ -202826,7 +202826,7 @@ sub_8077B74: ; 8077B74 adds r0, 0x37 strb r1, [r0] movs r0, 0 - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0 bl sub_8079BE0 movs r0, 0x1 @@ -203071,7 +203071,7 @@ sub_8077B74: ; 8077B74 add r0, sp, 0xC movs r2, 0xA movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r4, 0x20 adds r6, 0x1 cmp r6, 0x2 @@ -203109,7 +203109,7 @@ sub_8077B74: ; 8077B74 add r0, sp, 0xC movs r2, 0xA movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r4, 0x20 adds r6, 0x1 cmp r6, 0x2 @@ -203137,7 +203137,7 @@ sub_8077B74: ; 8077B74 movs r1, 0xD7 movs r2, 0x98 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront add r0, sp, 0xC ldm r4!, {r3,r5,r7} stm r0!, {r3,r5,r7} @@ -203152,7 +203152,7 @@ sub_8077B74: ; 8077B74 movs r1, 0xF7 movs r2, 0x98 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront movs r6, 0 add r4, sp, 0xC movs r5, 0xC0 @@ -203173,7 +203173,7 @@ sub_8077B74: ; 8077B74 add r0, sp, 0xC movs r2, 0x96 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront movs r0, 0x80 lsls r0, 14 adds r5, r0 @@ -203216,7 +203216,7 @@ sub_8077B74: ; 8077B74 ldrb r2, [r2] lsls r2, 3 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r4] adds r1, 0x34 strb r0, [r1] @@ -203315,8 +203315,8 @@ sub_8077B74: ; 8077B74 bl SetMainCallback2 @080780F6: bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably add sp, 0x24 pop {r3} @@ -203330,8 +203330,8 @@ sub_8077B74: ; 8077B74 thumb_func_start sub_807811C sub_807811C: ; 807811C push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -203492,8 +203492,8 @@ sub_807825C: ; 807825C bl SetGpuReg bl sub_8197224 bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r4} pop {r0} @@ -203538,13 +203538,13 @@ sub_80782B8: ; 80782B8 movs r0, 0x1 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette ldr r1, =gUnknown_0832CABC movs r2, 0x80 lsls r2, 4 movs r0, 0x2 movs r3, 0 - bl LoadBgTileMap + bl LoadBgTilemap b @0807837E .pool @08078324: @@ -203553,13 +203553,13 @@ sub_80782B8: ; 80782B8 lsls r2, 4 movs r0, 0x3 movs r3, 0 - bl LoadBgTileMap + bl LoadBgTilemap movs r0, 0 bl sub_8079E44 movs r0, 0x1 bl sub_8079E44 movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @0807837E .pool @0807834C: @@ -204677,7 +204677,7 @@ sub_8078CB8: ; 8078CB8 ldr r4, =0x02020630 adds r0, r4 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r2, [r5] adds r2, 0x34 ldrb r1, [r2] @@ -204707,7 +204707,7 @@ sub_8078CB8: ; 8078CB8 ldr r5, =0x02020630 adds r0, r5 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r4, [r4] adds r4, 0x34 ldrb r0, [r4] @@ -204861,7 +204861,7 @@ sub_8078DBC: ; 8078DBC movs r2, 0 bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x1 movs r1, 0x3 bl CopyWindowToVram @@ -205338,7 +205338,7 @@ sub_8079218: ; 8079218 @08079258: strb r1, [r0] movs r0, 0x11 - bl PutWindowTileMap + bl PutWindowTilemap b @08079290 .pool @08079268: @@ -205358,7 +205358,7 @@ sub_8079218: ; 8079218 movs r1, 0x64 strb r1, [r0] movs r0, 0x11 - bl PutWindowTileMap + bl PutWindowTilemap @08079290: pop {r0} bx r0 @@ -205381,7 +205381,7 @@ sub_807929C: ; 807929C @080792B2: lsrs r4, r6, 24 adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0 movs r1, 0x1 bl CopyWindowToVram @@ -205956,7 +205956,7 @@ sub_80796B4: ; 80796B4 adds r0, r4 lsls r0, 24 lsrs r0, 24 - bl ClearWindowTileMap + bl ClearWindowTilemap adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -206059,11 +206059,11 @@ sub_80796B4: ; 80796B4 str r0, [sp, 0x8] movs r0, 0x1 movs r3, 0 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r1, [sp, 0x60] cmp r1, 0 beq @08079868 @@ -206113,9 +206113,9 @@ sub_80796B4: ; 80796B4 str r0, [sp, 0x8] movs r0, 0x1 movs r3, 0 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r6, =0x02020630 ldr r1, =0x0203229c ldr r4, [r1] @@ -206219,12 +206219,12 @@ sub_80796B4: ; 80796B4 movs r3, 0 bl sub_8199EEC adds r0, r5, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r5, 0 movs r1, 0x3 bl CopyWindowToVram adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0 movs r1, 0x3 bl CopyWindowToVram @@ -206458,7 +206458,7 @@ sub_8079B84: ; 8079B84 movs r3, 0x4 bl box_print adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0 movs r1, 0x3 bl CopyWindowToVram @@ -206556,9 +206556,9 @@ sub_8079C4C: ; 8079C4C movs r0, 0x1 adds r2, r4, 0 adds r3, r5, 0 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram mov r0, r8 cmp r0, 0 bne @08079CB0 @@ -206947,9 +206947,9 @@ sub_8079F88: ; 8079F88 str r6, [sp, 0x8] movs r0, 0x1 movs r3, 0 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram adds r0, r4, 0 bl sub_8079E44 adds r0, r4, 0 @@ -206990,9 +206990,9 @@ sub_807A000: ; 807A000 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0x8 pop {r0} bx r0 @@ -207010,9 +207010,9 @@ sub_807A024: ; 807A024 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0x8 pop {r0} bx r0 @@ -207214,7 +207214,7 @@ sub_807A19C: ; 807A19C movs r2, 0xC bl sub_8098858 movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 movs r1, 0x3 bl CopyWindowToVram @@ -207294,7 +207294,7 @@ sub_807A1F0: ; 807A1F0 b @0807A2D6 @0807A2A0: mov r0, sp - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r1, =0x0203229c ldr r1, [r1] adds r2, r1, 0 @@ -207307,18 +207307,18 @@ sub_807A1F0: ; 807A1F0 b @0807A2D6 @0807A2BC: ldr r0, =gUnknown_0832DCE4 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette b @0807A2DA .pool @0807A2C8: ldr r0, =gUnknown_0832DC44 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette b @0807A2DA .pool @0807A2D4: ldr r0, =gUnknown_0832DC3C @0807A2D6: - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic @0807A2DA: ldr r0, =0x0203229c ldr r1, [r0] @@ -208401,7 +208401,7 @@ sub_807AABC: ; 807AABC cmp r1, 0xA bne @0807AADA adds r0, r2, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0807AADA: pop {r0} bx r0 @@ -208422,7 +208422,7 @@ sub_807AAE0: ; 807AAE0 cmp r1, 0xA bne @0807AAFE adds r0, r2, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0807AAFE: pop {r0} bx r0 @@ -208570,8 +208570,8 @@ sub_807ABCC: ; 807ABCC sub_807AC24: ; 807AC24 push {lr} bl sub_807ABCC - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -208743,7 +208743,7 @@ sub_807ACFC: ; 807ACFC ldr r1, [r1, 0x8] adds r2, r5, 0 adds r3, r7, 0 - bl help_system_enable_unless_flashback__sp199 + bl DecompressMonPic_DetectFrontOrBack_2 movs r4, 0 b @0807ADB2 .pool @@ -208761,11 +208761,11 @@ sub_807ACFC: ; 807ACFC ldr r1, [r2] adds r2, r5, 0 adds r3, r7, 0 - bl sub_8034B50 + bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack @0807ADB2: mov r0, r8 bl sub_806E794 - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette ldr r0, =0x020322a0 ldr r1, [r0] adds r0, r1, 0 @@ -208788,7 +208788,7 @@ sub_807ACFC: ; 807ACFC movs r1, 0x78 movs r2, 0x3C movs r3, 0x6 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r4, =0x020322a0 ldr r1, [r4] adds r1, 0x8E @@ -208882,8 +208882,8 @@ sub_807AE50: ; 807AE50 str r0, [r4] bl init_uns_table_pokemon_copy bl clear_tasks - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator ldr r0, =sub_807AC24 bl SetVBlankCallback bl sub_807B170 @@ -209075,9 +209075,9 @@ sub_807AE50: ; 807AE50 @0807B094: bl sub_807BA94 ldr r0, =gUnknown_08338D18 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, =gUnknown_08338D20 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette b @0807B0DC .pool @0807B0B0: @@ -209131,8 +209131,8 @@ sub_807AE50: ; 807AE50 @0807B116: bl run_active_tasks bl RunTextPrinters - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably add sp, 0x4 pop {r4,r5} @@ -209159,7 +209159,7 @@ sub_807B154: ; 807B154 movs r1, 0xFF bl FillWindowPixelBuffer movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 movs r1, 0x3 bl CopyWindowToVram @@ -209198,17 +209198,17 @@ sub_807B170: ; 807B170 bl Alloc adds r1, r0, 0 movs r0, 0 - bl SetBgTileMap + bl SetBgTilemap adds r0, r5, 0 bl Alloc adds r1, r0, 0 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap adds r0, r5, 0 bl Alloc adds r1, r0, 0 movs r0, 0x3 - bl SetBgTileMap + bl SetBgTilemap bl DeactivateAllTextPrinters ldr r0, =gUnknown_08C00000 mov r10, r0 @@ -209223,12 +209223,12 @@ sub_807B170: ; 807B170 mov r8, r0 ldr r4, =0x0201c000 adds r1, r4, 0 - bl call_LZZUnCompWram + bl LZDecompressWram movs r0, 0 adds r1, r4, 0 adds r2, r5, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer ldr r6, =gUnknown_08C004E0 adds r0, r6, 0 movs r1, 0 @@ -209245,12 +209245,12 @@ sub_807B170: ; 807B170 bl copy_decompressed_tile_data_to_vram_autofree mov r0, r8 adds r1, r4, 0 - bl call_LZZUnCompWram + bl LZDecompressWram movs r0, 0 adds r1, r4, 0 adds r2, r5, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer adds r0, r6, 0 movs r1, 0 movs r2, 0x20 @@ -209341,8 +209341,8 @@ sub_807B270: ; 807B270 str r0, [r4] bl init_uns_table_pokemon_copy bl clear_tasks - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator ldr r0, =sub_807AC24 bl SetVBlankCallback bl sub_807B170 @@ -209411,7 +209411,7 @@ sub_807B270: ; 807B270 movs r1, 0xFF bl FillWindowPixelBuffer movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 movs r1, 0x3 bl CopyWindowToVram @@ -209419,9 +209419,9 @@ sub_807B270: ; 807B270 @0807B3F0: bl sub_807BA94 ldr r0, =gUnknown_08338D18 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, =gUnknown_08338D20 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette b @0807B424 .pool @0807B40C: @@ -209450,8 +209450,8 @@ sub_807B270: ; 807B270 @0807B43E: bl run_active_tasks bl RunTextPrinters - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably add sp, 0xC pop {r3} @@ -209664,8 +209664,8 @@ sub_807B60C: ; 807B60C bl sub_807BBC8 bl run_active_tasks bl RunTextPrinters - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r0} bx r0 @@ -210105,17 +210105,17 @@ sub_807B62C: ; 807B62C sub_807BA94: ; 807BA94 push {lr} ldr r0, =gUnknown_08338D70 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, =gUnknown_08338DC0 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, =gUnknown_08338DF4 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, =gUnknown_08338E6C - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, =gUnknown_08338D78 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette ldr r0, =gUnknown_08338D80 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette pop {r0} bx r0 .pool @@ -210710,7 +210710,7 @@ sub_807BBEC: ; 807BBEC movs r1, 0x78 movs r2, 0x20 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] adds r1, 0xD3 strb r0, [r1] @@ -210730,7 +210730,7 @@ sub_807BBEC: ; 807BBEC adds r0, r1 lsls r0, 2 adds r0, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, [r7] bl @0807CF4C .pool @@ -210840,7 +210840,7 @@ sub_807BBEC: ; 807BBEC movs r1, 0x78 movs r2, 0x50 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] adds r1, 0x91 strb r0, [r1] @@ -210865,7 +210865,7 @@ sub_807BBEC: ; 807BBEC bl @0807CFB4 @0807C368: adds r0, r1, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r1, 0xC8 lsls r1, 3 movs r0, 0x50 @@ -210908,7 +210908,7 @@ sub_807BBEC: ; 807BBEC movs r1, 0x80 movs r2, 0x41 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] adds r1, 0x92 strb r0, [r1] @@ -210919,7 +210919,7 @@ sub_807BBEC: ; 807BBEC movs r1, 0x80 movs r2, 0x50 movs r3, 0x3 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r4, =0x020322a0 ldr r1, [r4] adds r1, 0x90 @@ -210928,7 +210928,7 @@ sub_807BBEC: ; 807BBEC movs r1, 0x80 movs r2, 0x50 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r4] adds r1, 0x91 strb r0, [r1] @@ -210941,7 +210941,7 @@ sub_807BBEC: ; 807BBEC ldr r1, =0x02020630 adds r0, r1 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r1, [r4] bl @0807CF4C .pool @@ -211040,7 +211040,7 @@ sub_807BBEC: ; 807BBEC lsls r0, 2 ldr r4, =0x02020630 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r7] adds r0, 0x91 ldrb r1, [r0] @@ -211048,7 +211048,7 @@ sub_807BBEC: ; 807BBEC adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0x2 bl sub_807B62C ldr r1, [r7] @@ -211068,7 +211068,7 @@ sub_807BBEC: ; 807BBEC movs r1, 0x6F movs r2, 0xAA movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r4, =0x020322a0 ldr r1, [r4] adds r1, 0x90 @@ -211078,7 +211078,7 @@ sub_807BBEC: ; 807BBEC adds r0, r5, 0 movs r1, 0x81 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r4] adds r1, 0x91 strb r0, [r1] @@ -211233,7 +211233,7 @@ sub_807BBEC: ; 807BBEC movs r1, 0 movs r2, 0x3 movs r3, 0x3 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft ldr r0, [r5] adds r0, 0x8E ldrb r1, [r0] @@ -211482,7 +211482,7 @@ sub_807BBEC: ; 807BBEC adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r7] adds r0, 0x91 ldrb r1, [r0] @@ -211490,7 +211490,7 @@ sub_807BBEC: ; 807BBEC adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles b @0807CFB4 .pool @0807C8EC: @@ -211519,7 +211519,7 @@ sub_807BBEC: ; 807BBEC movs r1, 0x80 adds r2, r4, 0 movs r3, 0x3 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] adds r1, 0x90 strb r0, [r1] @@ -211527,7 +211527,7 @@ sub_807BBEC: ; 807BBEC movs r1, 0x80 adds r2, r4, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] adds r1, 0x91 strb r0, [r1] @@ -211540,7 +211540,7 @@ sub_807BBEC: ; 807BBEC ldr r1, =0x02020630 adds r0, r1 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim b @0807CFB4 .pool @0807C964: @@ -211633,7 +211633,7 @@ sub_807BBEC: ; 807BBEC lsls r0, 2 ldr r4, =0x02020630 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r7] adds r0, 0x91 ldrb r1, [r0] @@ -211641,7 +211641,7 @@ sub_807BBEC: ; 807BBEC adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r3, [r7] adds r2, r3, 0 adds r2, 0x94 @@ -211703,7 +211703,7 @@ sub_807BBEC: ; 807BBEC movs r1, 0x80 movs r2, 0x41 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] adds r1, 0x92 strb r0, [r1] @@ -211725,7 +211725,7 @@ sub_807BBEC: ; 807BBEC movs r1, 0x78 movs r2, 0x50 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r2, =0x020322a0 ldr r1, [r2] adds r1, 0x91 @@ -211754,7 +211754,7 @@ sub_807BBEC: ; 807BBEC b @0807CFB4 @0807CB0E: adds r0, r1, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0x6 bl sub_807B62C ldr r1, [r7] @@ -211868,7 +211868,7 @@ sub_807BBEC: ; 807BBEC negs r2, r2 movs r1, 0x78 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r5, =0x020322a0 ldr r1, [r5] adds r1, 0xD3 @@ -211899,7 +211899,7 @@ sub_807BBEC: ; 807BBEC lsls r0, 2 adds r0, r4 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, [r5] adds r0, 0xD3 ldrb r1, [r0] @@ -211983,7 +211983,7 @@ sub_807BBEC: ; 807BBEC ldr r1, [r1] ldr r1, [r1, 0x10] ldr r3, [r3, 0x6C] - bl help_system_enable_unless_flashback__sp199 + bl DecompressMonPic_DetectFrontOrBack_2 ldr r1, [r7] b @0807CF4C .pool @@ -212031,7 +212031,7 @@ sub_807BBEC: ; 807BBEC lsls r0, 2 adds r0, r4 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r3, [r7] adds r0, r3, 0 adds r0, 0x8F @@ -212071,7 +212071,7 @@ sub_807BBEC: ; 807BBEC adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, [r7] b @0807CF4C .pool @@ -212265,13 +212265,13 @@ sub_807BBEC: ; 807BBEC beq @0807CFAA bl FreeAllWindowBuffers movs r0, 0x3 - bl GetBgTileMap + bl GetBgTilemap bl Free movs r0, 0x1 - bl GetBgTileMap + bl GetBgTilemap bl Free movs r0, 0 - bl GetBgTileMap + bl GetBgTilemap bl Free bl sub_805F094 ldr r0, [r7] @@ -212772,7 +212772,7 @@ sub_807CFC8: ; 807CFC8 movs r1, 0x78 movs r2, 0x20 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] adds r1, 0xD3 strb r0, [r1] @@ -212792,7 +212792,7 @@ sub_807CFC8: ; 807CFC8 adds r0, r1 lsls r0, 2 adds r0, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, [r7] bl @0807E398 .pool @@ -212902,7 +212902,7 @@ sub_807CFC8: ; 807CFC8 movs r1, 0x78 movs r2, 0x50 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] adds r1, 0x91 strb r0, [r1] @@ -212927,7 +212927,7 @@ sub_807CFC8: ; 807CFC8 bl @0807E400 @0807D748: adds r0, r1, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, =0x00000452 movs r0, 0x50 bl SetGpuReg @@ -212977,7 +212977,7 @@ sub_807CFC8: ; 807CFC8 movs r1, 0x78 movs r2, 0x50 movs r3, 0x3 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r4, =0x020322a0 ldr r1, [r4] adds r1, 0x90 @@ -212998,7 +212998,7 @@ sub_807CFC8: ; 807CFC8 movs r1, 0x78 movs r2, 0x50 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r4] adds r1, 0x91 strb r0, [r1] @@ -213010,7 +213010,7 @@ sub_807CFC8: ; 807CFC8 lsls r0, 2 adds r0, r5 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r1, [r4] bl @0807E398 .pool @@ -213109,7 +213109,7 @@ sub_807CFC8: ; 807CFC8 lsls r0, 2 ldr r4, =0x02020630 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r7] adds r0, 0x91 ldrb r1, [r0] @@ -213117,7 +213117,7 @@ sub_807CFC8: ; 807CFC8 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0x2 bl sub_807B62C ldr r1, [r7] @@ -213137,7 +213137,7 @@ sub_807CFC8: ; 807CFC8 movs r1, 0x6F movs r2, 0xAA movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r4, =0x020322a0 ldr r1, [r4] adds r1, 0x90 @@ -213147,7 +213147,7 @@ sub_807CFC8: ; 807CFC8 adds r0, r5, 0 movs r1, 0x81 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r4] adds r1, 0x91 strb r0, [r1] @@ -213307,7 +213307,7 @@ sub_807CFC8: ; 807CFC8 movs r1, 0 movs r2, 0x3 movs r3, 0x3 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft ldr r0, [r5] adds r0, 0x8E ldrb r1, [r0] @@ -213556,7 +213556,7 @@ sub_807CFC8: ; 807CFC8 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r7] adds r0, 0x91 ldrb r1, [r0] @@ -213564,7 +213564,7 @@ sub_807CFC8: ; 807CFC8 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles b @0807E400 .pool @0807DCF4: @@ -213600,7 +213600,7 @@ sub_807CFC8: ; 807CFC8 movs r1, 0x78 adds r2, r4, 0 movs r3, 0x3 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] adds r1, 0x90 strb r0, [r1] @@ -213620,7 +213620,7 @@ sub_807CFC8: ; 807CFC8 movs r1, 0x78 adds r2, r4, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] adds r1, 0x91 strb r0, [r1] @@ -213632,7 +213632,7 @@ sub_807CFC8: ; 807CFC8 lsls r0, 2 adds r0, r5 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim b @0807E400 .pool @0807DD94: @@ -213761,7 +213761,7 @@ sub_807CFC8: ; 807CFC8 lsls r0, 2 ldr r4, =0x02020630 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r7] adds r0, 0x91 ldrb r1, [r0] @@ -213769,7 +213769,7 @@ sub_807CFC8: ; 807CFC8 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r3, [r7] adds r2, r3, 0 adds r2, 0x94 @@ -213830,7 +213830,7 @@ sub_807CFC8: ; 807CFC8 movs r1, 0x78 movs r2, 0x50 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r2, =0x020322a0 ldr r1, [r2] adds r1, 0x91 @@ -213859,7 +213859,7 @@ sub_807CFC8: ; 807CFC8 b @0807E400 @0807DF5A: adds r0, r1, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0x6 bl sub_807B62C ldr r1, [r7] @@ -213973,7 +213973,7 @@ sub_807CFC8: ; 807CFC8 negs r2, r2 movs r1, 0x78 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r5, =0x020322a0 ldr r1, [r5] adds r1, 0xD3 @@ -214004,7 +214004,7 @@ sub_807CFC8: ; 807CFC8 lsls r0, 2 adds r0, r4 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, [r5] adds r0, 0xD3 ldrb r1, [r0] @@ -214088,7 +214088,7 @@ sub_807CFC8: ; 807CFC8 ldr r1, [r1] ldr r1, [r1, 0x10] ldr r3, [r3, 0x6C] - bl help_system_enable_unless_flashback__sp199 + bl DecompressMonPic_DetectFrontOrBack_2 ldr r1, [r7] b @0807E398 .pool @@ -214136,7 +214136,7 @@ sub_807CFC8: ; 807CFC8 lsls r0, 2 adds r0, r4 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r3, [r7] adds r0, r3, 0 adds r0, 0x8F @@ -214176,7 +214176,7 @@ sub_807CFC8: ; 807CFC8 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, [r7] b @0807E398 .pool @@ -214370,13 +214370,13 @@ sub_807CFC8: ; 807CFC8 beq @0807E3F6 bl FreeAllWindowBuffers movs r0, 0x3 - bl GetBgTileMap + bl GetBgTilemap bl Free movs r0, 0x1 - bl GetBgTileMap + bl GetBgTilemap bl Free movs r0, 0 - bl GetBgTileMap + bl GetBgTilemap bl Free bl sub_805F094 ldr r0, [r7] @@ -214472,8 +214472,8 @@ c2_08053788: ; 807E414 bne @0807E4C2 bl run_active_tasks @0807E4C2: - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r3} mov r8, r3 @@ -214698,7 +214698,7 @@ sub_807E64C: ; 807E64C cmp r0, 0x17 bne @0807E69E adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, =0x020322a0 ldr r0, [r0] adds r0, 0x94 @@ -215129,7 +215129,7 @@ sub_807EA2C: ; 807EA2C lsls r0, 2 ldr r4, =0x02020630 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r5] adds r0, 0x8F ldrb r1, [r0] @@ -215166,8 +215166,8 @@ sub_807EA2C: ; 807EA2C bl sub_807E4DC bl run_active_tasks bl RunTextPrinters - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r4-r6} pop {r0} @@ -215220,8 +215220,8 @@ sub_807EACC: ; 807EACC strb r1, [r0] @0807EB2C: bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r4} pop {r0} @@ -215715,8 +215715,8 @@ sub_807EB50: ; 807EB50 bne @0807F048 bl run_active_tasks @0807F048: - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably add sp, 0x4 pop {r4} @@ -215738,13 +215738,13 @@ c2_080543C4: ; 807F068 bne @0807F0BE bl FreeAllWindowBuffers movs r0, 0x3 - bl GetBgTileMap + bl GetBgTilemap bl Free movs r0, 0x1 - bl GetBgTileMap + bl GetBgTilemap bl Free movs r0, 0 - bl GetBgTileMap + bl GetBgTilemap bl Free bl sub_805F094 ldr r4, =0x020322a0 @@ -215762,8 +215762,8 @@ c2_080543C4: ; 807F068 bl SetMainCallback2 @0807F0BE: bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r4,r5} pop {r0} @@ -216499,8 +216499,8 @@ sub_807F464: ; 807F464 bne @0807F71A bl run_active_tasks @0807F71A: - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably add sp, 0x4 pop {r4,r5} @@ -216574,8 +216574,8 @@ sub_807F764: ; 807F764 str r0, [sp, 0xC] movs r0, 0x2 bl SetBgAffine - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram add sp, 0x10 pop {r4} @@ -216626,7 +216626,7 @@ sub_807F7D8: ; 807F7D8 adds r0, r2 str r1, [r0] adds r0, r5, 0 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r1, [r4] b @0807F966 .pool @@ -216636,9 +216636,9 @@ sub_807F7D8: ; 807F7D8 lsls r2, 3 movs r0, 0x2 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, =gUnknown_083390D4 movs r2, 0x80 lsls r2, 1 @@ -216669,7 +216669,7 @@ sub_807F7D8: ; 807F7D8 ldr r2, =0x000011bc adds r1, r2 ldr r1, [r1] - bl call_LZZUnCompWram + bl LZDecompressWram ldr r1, [r5] b @0807F966 .pool @@ -216696,7 +216696,7 @@ sub_807F7D8: ; 807F7D8 ldr r2, =0x000011bc adds r1, r2 ldr r1, [r1] - bl call_LZZUnCompWram + bl LZDecompressWram ldr r1, [r5] b @0807F966 .pool @@ -216713,9 +216713,9 @@ sub_807F7D8: ; 807F7D8 movs r0, 0x1 adds r1, r4, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r1, [r5] b @0807F966 .pool @@ -216728,11 +216728,11 @@ sub_807F7D8: ; 807F7D8 .pool @0807F950: ldr r0, =gUnknown_08339AC0 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, =gUnknown_08339BD8 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, =gUnknown_08339B38 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic @0807F962: ldr r0, =0x020322a4 ldr r1, [r0] @@ -216744,13 +216744,13 @@ sub_807F7D8: ; 807F7D8 .pool @0807F980: ldr r0, =gUnknown_08339C24 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, =gUnknown_08339C58 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, =gUnknown_08339AD0 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette ldr r0, =gUnknown_08339AC8 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette ldr r4, =0x020322a4 ldr r0, [r4] ldr r2, =0x000011bc @@ -216783,9 +216783,9 @@ sub_807F9D0: ; 807F9D0 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0 bl ShowBg movs r0, 0x1 @@ -216842,7 +216842,7 @@ sub_807FA34: ; 807FA34 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0xE0 bl sub_81978B0 @0807FA74: @@ -216916,8 +216916,8 @@ sub_807FAC8: ; 807FAC8 movs r0, 0 movs r1, 0 bl SetGpuReg - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator movs r0, 0 bl SetVBlankCallback movs r0, 0 @@ -216932,12 +216932,12 @@ sub_807FAC8: ; 807FAC8 lsls r0, 1 adds r1, r0 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x000009b8 adds r1, r0 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap movs r0, 0 movs r1, 0x1 movs r2, 0xD0 @@ -216993,7 +216993,7 @@ sub_807FAC8: ; 807FAC8 ldrb r2, [r5, 0x1] ldr r0, =gUnknown_08339AD8 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r6] adds r1, 0x50 adds r1, r4 @@ -217011,7 +217011,7 @@ sub_807FAC8: ; 807FAC8 adds r1, 0x8 lsls r1, 24 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim adds r5, 0x2 adds r4, 0x1 cmp r4, 0x3 @@ -217098,9 +217098,9 @@ sub_807FAC8: ; 807FAC8 bne @0807FCE2 bl FreeAllWindowBuffers movs r0, 0x2 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0x1 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0 bl SetVBlankCallback ldr r0, =sub_807FFA4 @@ -217109,8 +217109,8 @@ sub_807FAC8: ; 807FAC8 ldr r0, [r0] strb r4, [r0] @0807FCE2: - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl RunTextPrinters bl fade_and_return_progress_probably add sp, 0x4 @@ -217155,7 +217155,7 @@ sub_807FD08: ; 807FD08 cmp r0, 0x3 ble @0807FD50 adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles b @0807FD56 @0807FD50: movs r0, 0x74 @@ -217597,7 +217597,7 @@ sub_8080018: ; 8080018 ldrb r2, [r4, 0x1] ldr r0, =gUnknown_08339AD8 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r6] adds r1, 0x54 adds r1, r5 @@ -217615,7 +217615,7 @@ sub_8080018: ; 8080018 adds r1, 0x8 lsls r1, 24 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim adds r4, 0x2 adds r5, 0x1 cmp r5, 0x3 @@ -218019,7 +218019,7 @@ sub_8080018: ; 8080018 negs r2, r2 movs r1, 0x78 movs r3, 0x3 - bl obj_add_from_template_forward_search + bl AddObjectToFront b @080804F8 .pool @080804E4: @@ -218083,8 +218083,8 @@ sub_8080018: ; 8080018 ldrsh r1, [r1, r2] bl nullsub_31 bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl RunTextPrinters bl fade_and_return_progress_probably add sp, 0x4 @@ -218100,8 +218100,8 @@ sub_8080588: ; 8080588 movs r0, 0 movs r1, 0 bl SetGpuReg - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator bl clear_tasks ldr r0, =sub_807F764 bl SetVBlankCallback @@ -218117,12 +218117,12 @@ sub_8080588: ; 8080588 lsls r0, 1 adds r1, r0 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r3, =0x000009b8 adds r1, r3 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap movs r0, 0 movs r1, 0x1 movs r2, 0xD0 @@ -218428,7 +218428,7 @@ sub_80807BC: ; 80807BC mov r1, r8 lsrs r4, r1, 24 adds r1, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim add r1, sp, 0x8 movs r0, 0xFF strb r0, [r1] @@ -218481,7 +218481,7 @@ sub_80807BC: ; 80807BC @080808A6: lsrs r4, r5, 24 adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0 movs r1, 0x3 bl CopyWindowToVram @@ -218632,7 +218632,7 @@ sub_80808D4: ; 80808D4 ldrb r2, [r5, 0x1] ldr r0, =gUnknown_08339AD8 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r6] adds r1, 0x54 adds r1, r4 @@ -218650,7 +218650,7 @@ sub_80808D4: ; 80808D4 adds r1, 0x8 lsls r1, 24 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim adds r5, 0x2 adds r4, 0x1 cmp r4, 0x3 @@ -218933,7 +218933,7 @@ sub_80808D4: ; 80808D4 negs r2, r2 movs r1, 0x78 movs r3, 0x3 - bl obj_add_from_template_forward_search + bl AddObjectToFront @08080CAE: ldr r0, =0x020322a4 ldr r1, [r0] @@ -219061,8 +219061,8 @@ sub_80808D4: ; 80808D4 ldrsh r1, [r1, r2] bl nullsub_31 bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl RunTextPrinters bl fade_and_return_progress_probably add sp, 0x4 @@ -219624,7 +219624,7 @@ sub_8081288: ; 8081288 subs r2, r1 adds r1, r6, 0 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 adds r2, r1, 0 @@ -219637,7 +219637,7 @@ sub_8081288: ; 8081288 ldr r5, =0x02020630 adds r0, r4, r5 movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim adds r5, 0x1C adds r4, r5 ldr r0, =sub_8082F9C @@ -219656,7 +219656,7 @@ sub_8081288: ; 8081288 ldr r1, =0x02020630 adds r0, r1 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0x1F bl audio_play b @08081358 @@ -219671,7 +219671,7 @@ sub_8081288: ; 8081288 ldr r1, =0x02020630 adds r0, r1 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0x20 bl audio_play @08081358: @@ -220205,7 +220205,7 @@ sub_8081744: ; 8081744 adds r1, r5, 0x4 lsls r1, 24 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, [r4] adds r0, 0x4A ldrh r0, [r0] @@ -220357,8 +220357,8 @@ sub_8081898: ; 8081898 ldrsh r1, [r1, r2] bl nullsub_31 bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl RunTextPrinters bl fade_and_return_progress_probably pop {r4-r6} @@ -221634,7 +221634,7 @@ sub_8081FC8: ; 8081FC8 cmp r0, 0xFF beq @0808235C adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0 movs r1, 0x3 bl CopyWindowToVram @@ -221667,7 +221667,7 @@ sub_8081FC8: ; 8081FC8 cmp r0, 0xFF beq @0808239E adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0 movs r1, 0x3 bl CopyWindowToVram @@ -221807,8 +221807,8 @@ sub_8081FC8: ; 8081FC8 ldrsh r1, [r1, r2] bl nullsub_31 bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl RunTextPrinters bl fade_and_return_progress_probably pop {r3} @@ -222215,9 +222215,9 @@ sub_8082644: ; 8082644 bne @08082898 bl FreeAllWindowBuffers movs r0, 0x2 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0x1 - bl UnsetBgTileMap + bl UnsetBgTilemap ldr r0, [r6] bl Free str r4, [r6] @@ -222277,8 +222277,8 @@ sub_8082644: ; 8082644 ldrsh r1, [r1, r2] bl nullsub_31 bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl RunTextPrinters bl fade_and_return_progress_probably add sp, 0x4 @@ -222433,9 +222433,9 @@ sub_8082924: ; 8082924 @08082A76: bl FreeAllWindowBuffers movs r0, 0x2 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0x1 - bl UnsetBgTileMap + bl UnsetBgTilemap ldr r4, =0x020322a4 ldr r0, [r4] bl Free @@ -222457,8 +222457,8 @@ sub_8082924: ; 8082924 ldrsh r1, [r1, r2] bl nullsub_31 bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl RunTextPrinters bl fade_and_return_progress_probably pop {r4-r6} @@ -222906,7 +222906,7 @@ sub_8082E3C: ; 8082E3C cmp r0, 0 beq @08082E80 adds r0, r2, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08082E80: pop {r0} bx r0 @@ -222975,7 +222975,7 @@ sub_8082E84: ; 8082E84 adds r2, 0x50 ldr r0, =gUnknown_08339BE0 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -223037,7 +223037,7 @@ sub_8082F68: ; 8082F68 cmp r0, 0 beq @08082F94 adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08082F94: pop {r4} pop {r0} @@ -223073,7 +223073,7 @@ sub_8082F9C: ; 8082F9C cmp r0, 0 beq @08082FD4 adds r0, r2, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08082FD4: pop {r0} bx r0 @@ -223171,13 +223171,13 @@ sub_8083010: ; 8083010 cmp r0, 0x3 bne @080830A0 adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, =gUnknown_08339C60 movs r2, 0x14 negs r2, r2 movs r1, 0x78 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront b @080830B2 .pool @080830A0: @@ -223188,7 +223188,7 @@ sub_8083010: ; 8083010 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @080830B2: ldrh r0, [r4, 0x30] strh r0, [r4, 0x26] @@ -223257,7 +223257,7 @@ sub_80830C0: ; 80830C0 adds r0, 0x1 strb r0, [r1] adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08083130: ldrh r0, [r4, 0x30] strh r0, [r4, 0x26] @@ -223764,7 +223764,7 @@ sub_8083450: ; 8083450 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 @@ -224083,7 +224083,7 @@ sub_8083450: ; 8083450 lsls r4, r6, 24 lsrs r4, 24 adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0 movs r1, 0x3 bl CopyWindowToVram @@ -224566,7 +224566,7 @@ sub_8083B08: ; 8083B08 movs r1, 0x80 movs r2, 0x34 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r7, =0x020322a4 ldr r1, [r7] adds r1, 0x46 @@ -224580,7 +224580,7 @@ sub_8083B08: ; 8083B08 ldr r6, =0x02020630 adds r0, r6 movs r1, 0x3 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, [r7] adds r0, 0x46 ldrb r1, [r0] @@ -224596,7 +224596,7 @@ sub_8083B08: ; 8083B08 movs r1, 0xA0 movs r2, 0x34 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] adds r1, 0x47 strb r0, [r1] @@ -224612,7 +224612,7 @@ sub_8083B08: ; 8083B08 movs r1, 0xC0 movs r2, 0x34 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] adds r1, 0x48 strb r0, [r1] @@ -224624,7 +224624,7 @@ sub_8083B08: ; 8083B08 lsls r0, 2 adds r0, r6 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, [r7] adds r0, 0x48 ldrb r1, [r0] @@ -224771,7 +224771,7 @@ sub_8083B08: ; 8083B08 b @08083C84 @08083D8A: movs r0, 0x5 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x5 movs r1, 0x3 bl CopyWindowToVram @@ -224936,7 +224936,7 @@ sub_8083E24: ; 8083E24 cmp r6, 0x2 ble @08083E8A ldrb r0, [r4] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r4] movs r1, 0x3 bl CopyWindowToVram @@ -225261,7 +225261,7 @@ sub_808417C: ; 808417C movs r3, 0x1 bl sub_80840D4 movs r0, 0x4 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x4 movs r1, 0x3 bl CopyWindowToVram @@ -228686,13 +228686,13 @@ overworld_bg_setup: ; 8085CA8 mov r0, r8 ldr r1, [r0] movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r6] movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r5] movs r0, 0x3 - bl SetBgTileMap + bl SetBgTilemap bl sub_81971D0 pop {r3} mov r8, r3 @@ -228828,10 +228828,10 @@ c2_overworld_basic: ; 8085E24 push {lr} bl script_env_2_run_current_script bl run_active_tasks - bl call_obj_callbacks + bl CallObjectCallbacks bl camera_update bl sub_808A314 - bl obj_sync_something + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably bl sub_80A0A38 bl do_scheduled_bg_tilemap_copies_to_vram @@ -229401,8 +229401,8 @@ set_vblank_callback_8086390: ; 8086380 thumb_func_start vblank_cb_8086390 vblank_cb_8086390: ; 8086390 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl sub_80BA0A8 bl sub_8089BA4 bl copy_pal_bg_faded_to_pal_ram @@ -229934,8 +229934,8 @@ sub_80867D8: ; 80867D8 ldr r0, [r1, 0x8] movs r0, 0 movs r1, 0x80 - bl reset_super_sprites - bl copy_super_sprites_to_oam + bl ResetSpriteRange + bl LoadOamFromSprites add sp, 0x4 pop {r4-r7} pop {r0} @@ -230058,7 +230058,7 @@ sub_8086988: ; 8086988 push {r4,lr} adds r4, r0, 0 bl clear_tasks - bl reset_all_obj_data + bl ResetAllObjectData bl sub_80A1A74 bl dp12_8087EA4 bl dp13_810BB8C @@ -231925,7 +231925,7 @@ sub_808780C: ; 808780C lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08087838: movs r0, 0 strb r0, [r5] @@ -232546,7 +232546,7 @@ sub_8087C8C: ; 8087C8C lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim b @08087D0A .pool @08087CF8: @@ -232556,7 +232556,7 @@ sub_8087C8C: ; 8087C8C lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent @08087D0A: adds r0, r5, 0 movs r1, 0 @@ -238236,7 +238236,7 @@ sub_808A134: ; 808A134 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0808A150: adds r0, r5, 0 bl sub_808ED34 @@ -242415,7 +242415,7 @@ sub_808C114: ; 808C114 ldr r1, =0x02020630 adds r0, r1 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim pop {r4,r5} pop {r0} bx r0 @@ -242454,7 +242454,7 @@ sub_808C15C: ; 808C15C lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim pop {r4-r6} pop {r0} bx r0 @@ -242496,14 +242496,14 @@ sub_808C1B4: ; 808C1B4 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r1, [r6, 0x4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 add r0, r8 movs r1, 0x1 - bl obj_anim_image_seek + bl SeekObjectImageAnim pop {r3} mov r8, r3 pop {r4-r6} @@ -242544,7 +242544,7 @@ sub_808C228: ; 808C228 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim pop {r4-r6} pop {r0} bx r0 @@ -243261,7 +243261,7 @@ sub_808C814: ; 808C814 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r5, 0 bl remove_task @0808C87A: @@ -243627,7 +243627,7 @@ sub_808CABC: ; 808CABC lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @0808CB5C: movs r0, 0x1 pop {r4-r6} @@ -243925,7 +243925,7 @@ sub_808CD94: ; 808CD94 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer @@ -243973,7 +243973,7 @@ sub_808CE04: ; 808CE04 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer @@ -244133,7 +244133,7 @@ sub_808CF78: ; 808CF78 ldr r1, =0x02020630 adds r4, r0, r1 adds r0, r4, 0 - bl obj_anim_step + bl AnimateObject movs r0, 0 strh r0, [r4, 0x24] strh r0, [r4, 0x26] @@ -244760,7 +244760,7 @@ sub_808D450: ; 808D450 movs r1, 0 movs r2, 0 movs r3, 0x1F - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 ldr r1, =0x02020630 @@ -244793,7 +244793,7 @@ sub_808D450: ; 808D450 movs r1, 0 movs r2, 0 movs r3, 0x1F - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 lsls r4, r0, 4 @@ -245422,7 +245422,7 @@ npc_delete_obj_and_free_tiles_for_npc_type: ; 808D90C adds r0, r1 lsls r0, 2 adds r0, r2 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles add sp, 0x8 pop {r4} pop {r0} @@ -245543,7 +245543,7 @@ npc_spawn_with_provided_template: ; 808D98C movs r1, 0 movs r2, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 mov r8, r0 @@ -245648,7 +245648,7 @@ npc_spawn_with_provided_template: ; 808D98C lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @0808DB16: ldrb r0, [r6, 0xB] lsrs r0, 4 @@ -245756,7 +245756,7 @@ npc_instanciation_something: ; 808DB40 lsls r0, 2 adds r0, r4 adds r1, r2, 0 - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable @0808DBF0: adds r0, r5, 0 @0808DBF2: @@ -246003,7 +246003,7 @@ sub_808DD68: ; 808DD68 asrs r2, 16 adds r0, r6, 0 mov r3, r9 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r5, r0, 24 adds r0, r6, 0 @@ -246019,7 +246019,7 @@ sub_808DD68: ; 808DD68 ldr r0, =0x02020630 adds r4, r0 adds r0, r4, 0 - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable adds r4, 0x42 ldrb r1, [r4] movs r0, 0x3F @@ -246099,7 +246099,7 @@ sprite_new: ; 808DE0C ldrsh r2, [r6, r0] mov r0, sp movs r3, 0 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 @@ -246181,7 +246181,7 @@ sprite_new: ; 808DE0C cmp r1, 0 beq @0808DF48 adds r0, r5, 0 - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable adds r2, r5, 0 adds r2, 0x42 ldrb r0, [r2] @@ -246204,7 +246204,7 @@ sprite_new: ; 808DE0C lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @0808DF6C: adds r0, r6, 0 add sp, 0x20 @@ -246611,7 +246611,7 @@ sub_808E1B8: ; 808E1B8 movs r1, 0 movs r2, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x40 @@ -246678,7 +246678,7 @@ sub_808E1B8: ; 808E1B8 cmp r1, 0 beq @0808E31E adds r0, r4, 0 - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable @0808E31E: mov r0, r8 lsls r2, r0, 4 @@ -246711,7 +246711,7 @@ sub_808E1B8: ; 808E1B8 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @0808E362: adds r0, r6, 0 bl sub_808E38C @@ -246981,14 +246981,14 @@ npc_turn: ; 808E544 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r1, [r6, 0x4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r5 movs r1, 0 - bl obj_anim_image_seek + bl SeekObjectImageAnim @0808E58A: pop {r4-r6} pop {r0} @@ -247116,7 +247116,7 @@ get_berry_tree_graphics: ; 808E5F4 strb r0, [r7, 0x5] adds r0, r7, 0 adds r1, r6, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @0808E680: pop {r4-r7} pop {r0} @@ -247393,7 +247393,7 @@ sub_808E82C: ; 808E82C thumb_func_start gpu_pal_allocator_reset__manage_upper_four gpu_pal_allocator_reset__manage_upper_four: ; 808E880 push {lr} - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator ldr r1, =0x0300301c movs r0, 0xC strb r0, [r1] @@ -247458,13 +247458,13 @@ sub_808E8F4: ; 808E8F4 push {r4,lr} adds r4, r0, 0 ldrh r0, [r4, 0x4] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF bne @0808E912 adds r0, r4, 0 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette lsls r0, 24 lsrs r0, 24 b @0808E914 @@ -248040,7 +248040,7 @@ sub_808ED34: ; 808ED34 movs r1, 0 movs r2, 0 movs r3, 0x4 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r2, =0x02020630 @@ -256348,7 +256348,7 @@ npc_apply_anim_looping: ; 8092A70 @08092AAA: ldrb r1, [r1] adds r0, r4, 0 - bl obj_anim_image_seek + bl SeekObjectImageAnim @08092AB2: pop {r4} pop {r0} @@ -256383,7 +256383,7 @@ obj_npc_animation_step: ; 8092AB8 ldrb r1, [r2, 0x4] @08092AEA: adds r0, r4, 0 - bl obj_anim_image_seek + bl SeekObjectImageAnim @08092AF0: pop {r4} pop {r0} @@ -261330,7 +261330,7 @@ sub_8094DE4: ; 8094DE4 lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim add sp, 0x4 pop {r4,r5} pop {r0} @@ -262641,7 +262641,7 @@ sub_80956F4: ; 80956F4 lsrs r2, 6 movs r3, 0 adds r0, r4, 0 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft movs r0, 0x1 pop {r4} pop {r1} @@ -263302,7 +263302,7 @@ sub_8095B84: ; 8095B84 lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent adds r0, r6, 0 bl do_animation_x03 add sp, 0x4 @@ -264029,10 +264029,10 @@ sub_80960C8: ; 80960C8 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r4, 0 movs r1, 0 - bl obj_anim_image_seek + bl SeekObjectImageAnim pop {r4,r5} pop {r0} bx r0 @@ -264385,10 +264385,10 @@ sub_8096330: ; 8096330 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r4, 0 movs r1, 0 - bl obj_anim_image_seek + bl SeekObjectImageAnim pop {r4,r5} pop {r0} bx r0 @@ -265868,6 +265868,7 @@ sub_8096DB8: ; 8096DB8 thumb_func_end sub_8096DB8 thumb_func_start npc_y_height_related +; void npc_y_height_related(u8 a1, struct obj *object, u8 a3) npc_y_height_related: ; 8096E0C push {r4,r5,lr} lsls r0, 24 @@ -267475,7 +267476,7 @@ obj_anim_image_set_and_seek: ; 8097994 ands r1, r3 strb r1, [r4] adds r1, r2, 0 - bl obj_anim_image_seek + bl SeekObjectImageAnim pop {r4} pop {r0} bx r0 @@ -267669,7 +267670,7 @@ sub_8097AF0: ; 8097AF0 cmp r1, r0 bne @08097B16 adds r0, r2, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08097B16: adds r5, 0x44 subs r4, 0x1 @@ -267745,7 +267746,7 @@ sub_8097B78: ; 8097B78 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @08097BAA: pop {r4,r5} pop {r0} @@ -267805,7 +267806,7 @@ sub_8097BB4: ; 8097BB4 .pool @08097C20: adds r0, r4, 0 - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable adds r2, r4, 0 adds r2, 0x42 ldrb r0, [r2] @@ -267817,7 +267818,7 @@ sub_8097BB4: ; 8097BB4 @08097C36: adds r0, r4, 0 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @08097C3E: pop {r4,r5} pop {r0} @@ -269514,7 +269515,7 @@ sub_8098858: ; 8098858 adds r1, r5, 0 ldr r2, [sp, 0x14] adds r3, r4, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect adds r1, r5, 0x1 lsls r1, 16 lsrs r1, 16 @@ -269534,7 +269535,7 @@ sub_8098858: ; 8098858 adds r0, r7, 0 ldr r2, [sp, 0x18] adds r3, r4, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect adds r1, r5, 0x2 lsls r1, 16 lsrs r1, 16 @@ -269551,7 +269552,7 @@ sub_8098858: ; 8098858 adds r0, r7, 0 mov r2, r8 adds r3, r4, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect adds r1, r5, 0x3 lsls r1, 16 lsrs r1, 16 @@ -269569,7 +269570,7 @@ sub_8098858: ; 8098858 adds r0, r7, 0 ldr r2, [sp, 0x14] mov r3, r9 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect adds r1, r5, 0x5 lsls r1, 16 lsrs r1, 16 @@ -269581,7 +269582,7 @@ sub_8098858: ; 8098858 adds r0, r7, 0 mov r2, r8 mov r3, r9 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect adds r1, r5, 0x6 lsls r1, 16 lsrs r1, 16 @@ -269597,7 +269598,7 @@ sub_8098858: ; 8098858 adds r0, r7, 0 ldr r2, [sp, 0x14] adds r3, r6, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect adds r1, r5, 0x7 lsls r1, 16 lsrs r1, 16 @@ -269610,7 +269611,7 @@ sub_8098858: ; 8098858 adds r0, r7, 0 ldr r2, [sp, 0x18] adds r3, r6, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect adds r5, 0x8 lsls r5, 16 lsrs r5, 16 @@ -269623,7 +269624,7 @@ sub_8098858: ; 8098858 adds r1, r5, 0 mov r2, r8 adds r3, r6, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect add sp, 0x20 pop {r3-r5} mov r8, r3 @@ -269697,7 +269698,7 @@ sub_80989E0: ; 80989E0 adds r0, r7, 0 mov r1, r9 adds r3, r4, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect mov r1, r9 adds r1, 0x1 lsls r1, 16 @@ -269718,7 +269719,7 @@ sub_80989E0: ; 80989E0 str r0, [sp, 0x8] adds r0, r7, 0 adds r3, r4, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect mov r1, r9 adds r1, 0x2 lsls r1, 16 @@ -269739,7 +269740,7 @@ sub_80989E0: ; 80989E0 adds r0, r7, 0 mov r2, r8 adds r3, r4, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect mov r1, r9 adds r1, 0x3 lsls r1, 16 @@ -269759,7 +269760,7 @@ sub_80989E0: ; 80989E0 adds r0, r7, 0 ldr r2, [sp, 0x10] adds r3, r5, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect mov r1, r9 adds r1, 0x5 lsls r1, 16 @@ -269772,7 +269773,7 @@ sub_80989E0: ; 80989E0 adds r0, r7, 0 mov r2, r8 adds r3, r5, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect mov r1, r9 adds r1, 0x6 lsls r1, 16 @@ -269790,7 +269791,7 @@ sub_80989E0: ; 80989E0 adds r0, r7, 0 ldr r2, [sp, 0x10] adds r3, r6, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect mov r1, r9 adds r1, 0x7 lsls r1, 16 @@ -269804,7 +269805,7 @@ sub_80989E0: ; 80989E0 adds r0, r7, 0 ldr r2, [sp, 0x14] adds r3, r6, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r0, 0x8 add r9, r0 mov r0, r9 @@ -269820,7 +269821,7 @@ sub_80989E0: ; 80989E0 mov r1, r9 mov r2, r8 adds r3, r6, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect add sp, 0x1C pop {r3-r5} mov r8, r3 @@ -269897,7 +269898,7 @@ rbox_fill_rectangle: ; 8098B7C movs r1, 0 mov r2, r8 adds r3, r5, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect add sp, 0xC pop {r3,r4} mov r8, r3 @@ -274607,7 +274608,7 @@ sub_809AE6C: ; 809AE6C movs r1, 0 bl sub_81973FC ldrb r0, [r5] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r5] movs r1, 0x11 bl FillWindowPixelBuffer @@ -282023,7 +282024,7 @@ sub_809E8E8: ; 809E8E8 b @0809E9FE @0809E9F8: adds r0, r3, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0809E9FE: pop {r0} bx r0 @@ -282154,7 +282155,7 @@ sub_809EA04: ; 809EA04 b @0809EAFE @0809EAF8: adds r0, r3, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0809EAFE: pop {r0} bx r0 @@ -282169,13 +282170,13 @@ sub_809EB04: ; 809EB04 lsls r5, 24 lsrs r5, 24 ldr r0, =gUnknown_085104C4 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette ldr r0, =gUnknown_085104F0 mov r8, r0 movs r1, 0x35 movs r2, 0x44 movs r3, 0 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r1, r0, 24 ldr r6, =0x02020630 @@ -282195,7 +282196,7 @@ sub_809EB04: ; 809EB04 movs r1, 0x35 movs r2, 0x44 movs r3, 0 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r1, r0, 24 lsls r0, r1, 4 @@ -282222,7 +282223,7 @@ sub_809EB8C: ; 809EB8C push {lr} ldr r0, =gUnknown_085104C4 ldrh r0, [r0, 0x4] - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag pop {r0} bx r0 .pool @@ -282764,11 +282765,11 @@ sub_809EF88: ; 809EF88 ldr r0, [r1, 0x8] movs r0, 0 movs r1, 0x80 - bl reset_super_sprites - bl copy_super_sprites_to_oam + bl ResetSpriteRange + bl LoadOamFromSprites bl remove_some_task bl dp12_8087EA4 - bl reset_all_obj_data + bl ResetAllObjectData bl clear_tasks bl sub_80A1A74 bl sub_809F048 @@ -282817,8 +282818,8 @@ sub_809F048: ; 809F048 sub_809F090: ; 809F090 push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl do_scheduled_bg_tilemap_copies_to_vram bl fade_and_return_progress_probably pop {r0} @@ -282828,8 +282829,8 @@ sub_809F090: ; 809F090 thumb_func_start sub_809F0AC sub_809F0AC: ; 809F0AC push {lr} - bl copy_queue_process - bl copy_super_sprites_to_oam + bl ProcessObjectCopyRequests + bl LoadOamFromSprites bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -283467,7 +283468,7 @@ sub_809F654: ; 809F654 bl AddWindow strb r0, [r4] ldrb r0, [r4] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r4] movs r1, 0 bl sub_81973FC @@ -283525,7 +283526,7 @@ sub_809F6C8: ; 809F6C8 strb r0, [r4] ldr r4, =0x0203760d ldrb r0, [r4] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r4] movs r1, 0 bl sub_81973FC @@ -285150,7 +285151,7 @@ sub_80A03E4: ; 80A03E4 b @080A04FC .pool @080A0490: - bl reset_all_obj_data + bl ResetAllObjectData bl clear_tasks bl sub_80A1A74 bl dp12_8087EA4 @@ -285293,7 +285294,7 @@ sub_80A0550: ; 80A0550 movs r2, 0xE bl sub_8098858 movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 movs r1, 0x3 bl CopyWindowToVram @@ -285703,7 +285704,7 @@ decompress_palette: ; 80A18F4 lsls r5, 16 ldr r6, =0x02037fe8 adds r1, r6, 0 - bl call_LZZUnCompWram + bl LZDecompressWram lsls r4, 1 ldr r1, =0x02037714 adds r1, r4, r1 @@ -290103,7 +290104,7 @@ move_anim_8072740: ; 80A3BFC adds r4, r0, 0 bl obj_free_rotscale_entry adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, =0x020383fe ldrb r0, [r1] subs r0, 0x1 @@ -290264,11 +290265,11 @@ ma00_load_graphics: ; 80A3D24 lsls r5, r4, 3 ldr r0, =gUnknown_085112C4 adds r0, r5, r0 - bl gpu_tile_obj_decompress_and_load3 + bl LoadCompressedObjectPicUsingHeap ldr r0, =gUnknown_08511BCC adds r5, r0 adds r0, r5, 0 - bl gpu_pal_obj_decompress_and_apply3 + bl LoadCompressedObjectPaletteUsingHeap ldr r0, [r6] adds r0, 0x2 str r0, [r6] @@ -290309,9 +290310,9 @@ ma01_080728D0: ; 80A3D8C adds r0, r1 ldrh r5, [r0, 0x6] adds r0, r5, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r5, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag ldr r0, [r6] adds r0, 0x2 str r0, [r6] @@ -290434,7 +290435,7 @@ ma02_instanciate_template: ; 80A3DD8 lsrs r3, 24 adds r0, r7, 0 adds r1, r4, 0 - bl obj_add_from_template_call_callback_once + bl AddObjectAndAnimateForOneFrame ldr r1, =0x020383fe ldrb r0, [r1] adds r0, 0x1 @@ -290636,12 +290637,12 @@ sub_80A3FC4: ; 80A3FC4 lsls r0, 3 adds r0, r6 ldrh r0, [r0, 0x6] - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag ldrh r0, [r4] lsls r0, 3 adds r0, r6 ldrh r0, [r0, 0x6] - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag ldrh r1, [r4] adds r0, r7, 0 orrs r0, r1 @@ -292497,7 +292498,7 @@ sub_80A4FC8: ; 80A4FC8 ldr r0, [r0] ldr r5, =0x0201c000 adds r1, r5, 0 - bl call_LZZUnCompWram + bl LZDecompressWram bl sub_80A6D94 lsls r0, 24 lsrs r0, 24 @@ -292516,7 +292517,7 @@ sub_80A4FC8: ; 80A4FC8 adds r0, r4, r6 ldr r0, [r0] ldr r1, =0x06002000 - bl call_LZZUnCompVram + bl LZDecompressVram adds r6, 0x4 adds r4, r6 ldr r4, [r4] @@ -292539,11 +292540,11 @@ sub_80A4FC8: ; 80A4FC8 adds r0, r4, r0 ldr r0, [r0] ldr r1, =0x0600d000 - bl call_LZZUnCompVram + bl LZDecompressVram adds r0, r4, r5 ldr r0, [r0] ldr r1, =0x06008000 - bl call_LZZUnCompVram + bl LZDecompressVram adds r5, 0x4 adds r4, r5 ldr r0, [r4] @@ -296133,10 +296134,10 @@ sub_80A6C68: ; 80A6C68 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect add r0, sp, 0xC ldrb r0, [r0, 0x9] - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0x20 pop {r0} bx r0 @@ -296161,7 +296162,7 @@ sub_80A6CC0: ; 80A6CC0 bl CpuSet ldr r1, [r4] mov r0, r8 - bl call_LZZUnCompWram + bl LZDecompressWram lsls r5, 24 lsrs r5, 24 ldr r1, [r4] @@ -296199,12 +296200,12 @@ sub_80A6D10: ; 80A6D10 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect adds r0, r4, 0 adds r1, r5, 0 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer add sp, 0xC pop {r4,r5} pop {r0} @@ -296219,7 +296220,7 @@ sub_80A6D48: ; 80A6D48 lsls r4, 24 lsrs r4, 24 adds r0, r4, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram pop {r4} pop {r0} bx r0 @@ -296245,7 +296246,7 @@ sub_80A6D60: ; 80A6D60 bl sub_80A4720 @080A6D86: ldrb r0, [r4, 0x9] - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram pop {r4,r5} pop {r0} bx r0 @@ -297017,7 +297018,7 @@ sub_80A7270: ; 80A7270 lsrs r2, 6 lsls r3, 30 lsrs r3, 30 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft pop {r3} mov r8, r3 pop {r4-r7} @@ -297065,7 +297066,7 @@ sub_80A7344: ; 80A7344 lsrs r2, 6 lsls r3, 30 lsrs r3, 30 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft pop {r4} pop {r0} bx r0 @@ -297144,7 +297145,7 @@ sub_80A73E0: ; 80A73E0 lsls r3, 30 lsrs r3, 30 adds r0, r4, 0 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft @080A742E: ldr r6, =0xffff0000 lsls r0, r7, 16 @@ -297225,7 +297226,7 @@ sub_80A749C: ; 80A749C lsls r3, 30 lsrs r3, 30 adds r0, r4, 0 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft add sp, 0x4 pop {r4} pop {r0} @@ -297934,7 +297935,7 @@ obj_delete_but_dont_free_vram: ; 80A7A5C movs r2, 0x40 orrs r1, r2 strb r1, [r3] - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles pop {r0} bx r0 thumb_func_end obj_delete_but_dont_free_vram @@ -298234,7 +298235,7 @@ sub_80A7CB4: ; 80A7CB4 lsrs r4, r0, 24 ldr r0, =0x0203841e ldrh r0, [r0] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF @@ -299152,7 +299153,7 @@ sub_80A8394: ; 80A8394 lsls r0, r7, 3 ldr r1, =gUnknown_08525FC0 adds r0, r1 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic lsls r0, 16 lsrs r0, 16 str r0, [sp, 0xC] @@ -299162,7 +299163,7 @@ sub_80A8394: ; 80A8394 lsls r0, 3 adds r0, r1 ldrh r0, [r0, 0x2] - bl gpu_pal_alloc_new + bl AllocObjectPalette lsls r0, 24 lsrs r5, r0, 24 ldr r4, =0x020244d4 @@ -299246,7 +299247,7 @@ sub_80A8394: ; 80A8394 str r2, [sp] adds r2, r6, 0 mov r3, r8 - bl load_poke_gfx_probably + bl DecompressMonPic_2 b @080A8540 .pool @080A84B0: @@ -299297,7 +299298,7 @@ sub_80A8394: ; 80A8394 str r2, [sp] adds r2, r6, 0 mov r3, r8 - bl sub_8034B7C + bl DecompressMonPicWithoutDuplicatingDeoxysTiles b @080A8540 .pool @080A8524: @@ -299313,7 +299314,7 @@ sub_80A8394: ; 80A8394 str r2, [sp] adds r2, r6, 0 mov r3, r8 - bl load_poke_gfx_probably + bl DecompressMonPic_2 @080A8540: ldr r5, =0x020244d4 ldr r0, [r5] @@ -299370,7 +299371,7 @@ sub_80A8394: ; 80A8394 lsls r2, 16 asrs r2, 16 ldr r3, [sp, 0x8] - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r4, r0, 24 bl sub_80A4DF0 @@ -299405,7 +299406,7 @@ sub_80A8394: ; 80A8394 thumb_func_start sub_80A8610 sub_80A8610: ; 80A8610 push {lr} - bl obj_delete_and_free_resources + bl RemoveObjectAndFreeResources pop {r0} bx r0 thumb_func_end sub_80A8610 @@ -300047,7 +300048,7 @@ sub_80A8AEC: ; 80A8AEC strh r0, [r4, 0x38] ldrb r1, [r1, 0xC] adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r1, =move_anim_8074EE0 adds r0, r4, 0 bl oamt_set_x3A_32 @@ -300142,7 +300143,7 @@ sub_80A8BC4: ; 80A8BC4 subs r1, r2 strh r1, [r0, 0x24] ldr r0, =0x00002771 - bl gpu_pal_alloc_new + bl AllocObjectPalette lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x10] @@ -300291,7 +300292,7 @@ sub_80A8CAC: ; 80A8CAC cmp r0, 0 bne @080A8D6C ldr r0, =0x00002771 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag adds r0, r5, 0 bl move_anim_task_del @080A8D6C: @@ -300661,10 +300662,10 @@ c2_80777E8: ; 80A933C bl sub_8035AA4 b @080A95D2 @080A944A: - bl reset_all_obj_data + bl ResetAllObjectData b @080A95D2 @080A9450: - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator ldr r1, =0x0300301c movs r0, 0x4 strb r0, [r1] @@ -301068,7 +301069,7 @@ sub_80A9708: ; 80A9708 adds r0, r5, 0 adds r1, r4, 0 mov r2, r8 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, =0x020241e4 adds r4, r7, r1 strb r0, [r4] @@ -301120,7 +301121,7 @@ sub_80A9708: ; 80A9708 ldr r1, =0x020244e4 adds r1, r7, r1 ldrb r1, [r1] - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] @@ -301204,7 +301205,7 @@ sub_80A9708: ; 80A9708 @080A9914: movs r1, 0x50 adds r2, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r3, =0x020241e4 strb r0, [r3] ldr r4, =0x02020630 @@ -301285,7 +301286,7 @@ sub_80A9708: ; 80A9708 adds r0, r5, 0 adds r1, r4, 0 mov r2, r8 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, =0x020241e4 adds r4, r7, r1 strb r0, [r4] @@ -301337,7 +301338,7 @@ sub_80A9708: ; 80A9708 ldr r1, =0x020244e4 adds r1, r7, r1 ldrb r1, [r1] - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] @@ -301588,9 +301589,9 @@ sub_80A9C70: ; 80A9C70 lsrs r0, 24 mov r8, r0 ldr r0, =gUnknown_08524F84 - bl gpu_tile_obj_decompress_and_load3 + bl LoadCompressedObjectPicUsingHeap ldr r0, =gUnknown_0852588C - bl gpu_pal_obj_decompress_and_apply3 + bl LoadCompressedObjectPaletteUsingHeap ldr r1, =0x03005e00 mov r2, r8 lsls r0, r2, 2 @@ -301617,7 +301618,7 @@ sub_80A9C70: ; 80A9C70 asrs r2, 16 ldr r0, =gUnknown_0853EF60 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r4, r0, 24 lsls r0, r4, 4 @@ -301669,7 +301670,7 @@ sub_80A9C70: ; 80A9C70 asrs r2, 16 ldr r0, =gUnknown_0853EF60 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r4, r0, 24 lsls r0, r4, 4 @@ -301876,11 +301877,11 @@ sub_80A9E78: ; 80A9E78 cmp r0, 0 beq @080A9EE6 adds r0, r4, 0 - bl obj_delete_and_free_resources + bl RemoveObjectAndFreeResources b @080A9EEC @080A9EE6: adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @080A9EEC: pop {r4} pop {r0} @@ -301932,11 +301933,11 @@ sub_80A9EF4: ; 80A9EF4 lsls r2, r4, 16 asrs r2, 16 movs r3, 0x4 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r4, r0, 24 ldr r0, =0x0000271a - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 @@ -301958,7 +301959,7 @@ sub_80A9EF4: ; 80A9EF4 ldr r1, =0x02020630 adds r0, r1 ldr r1, =gUnknown_0853EF40 - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 @@ -302020,7 +302021,7 @@ sub_80AA020: ; 80AA020 lsls r4, 24 lsrs r4, 24 ldr r0, =0x0000271a - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r2, r0, 24 ldr r1, =0x03005e00 @@ -302164,7 +302165,7 @@ sub_80AA124: ; 80AA124 adds r0, r4, 0 bl obj_free_rotscale_entry adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles b @080AA186 .pool @080AA16C: @@ -302630,7 +302631,7 @@ sub_80AA4EC: ; 80AA4EC adds r1, r5, 0 asrs r2, r7, 16 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r4, r0, 4 @@ -302640,7 +302641,7 @@ sub_80AA4EC: ; 80AA4EC adds r4, r0 adds r0, r4, 0 adds r1, r6, 0 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0x1 strh r0, [r4, 0x2E] adds r0, r6, 0x1 @@ -302673,7 +302674,7 @@ sub_80AA548: ; 80AA548 adds r1, r4, 0 asrs r2, r6, 16 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r2, r0, 4 @@ -302685,7 +302686,7 @@ sub_80AA548: ; 80AA548 lsls r1, 24 lsrs r1, 24 adds r0, r2, 0 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -302784,7 +302785,7 @@ title_screen_logo_shine_obj_callback_type1: ; 80AA5A4 movs r0, 0 strh r0, [r1] adds r0, r3, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @080AA648: pop {r4} pop {r0} @@ -302810,7 +302811,7 @@ title_screen_logo_shine_obj_callback_type2: ; 80AA654 .pool @080AA670: adds r0, r2, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @080AA676: pop {r0} bx r0 @@ -302841,7 +302842,7 @@ title_screen_add_logo_shine_obj: ; 80AA67C movs r1, 0 movs r2, 0x44 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 ldr r1, =0x02020630 @@ -302865,7 +302866,7 @@ title_screen_add_logo_shine_obj: ; 80AA67C movs r1, 0 movs r2, 0x44 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 ldr r6, =0x02020630 @@ -302893,7 +302894,7 @@ title_screen_add_logo_shine_obj: ; 80AA67C movs r1, 0 movs r2, 0x44 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 lsls r1, r2, 4 @@ -302917,7 +302918,7 @@ title_screen_add_logo_shine_obj: ; 80AA67C mov r0, r9 movs r2, 0x44 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 lsls r0, r2, 4 @@ -302948,8 +302949,8 @@ title_screen_add_logo_shine_obj: ; 80AA67C title_screen_vblank_callback: ; 80AA780 push {lr} bl sub_80BA0A8 - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram ldr r0, =0x02022e1a ldrh r1, [r0] @@ -303099,24 +303100,24 @@ c2_title_screen_1: ; 80AA7A4 bl LZ77UnCompVram bl remove_some_task bl clear_tasks - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator ldr r1, =0x0300301c movs r0, 0x9 strb r0, [r1] ldr r0, =gUnknown_08540048 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085400F0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_0854013C - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_08DDE438 movs r1, 0x80 lsls r1, 1 movs r2, 0x20 bl gpu_pal_apply ldr r0, =gUnknown_08540100 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 @@ -303278,8 +303279,8 @@ c2_title_screen_1: ; 80AA7A4 c2_title_screen_2: ; 80AAB2C push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r0} bx r0 @@ -303370,7 +303371,7 @@ task_title_screen_1: ; 80AAB44 movs r1, 0x62 movs r2, 0x2 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r4, =0x02020630 @@ -303385,7 +303386,7 @@ task_title_screen_1: ; 80AAB44 movs r1, 0xA2 movs r2, 0x2 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -303813,7 +303814,7 @@ sub_80AAFA4: ; 80AAFA4 bne @080AB060 movs r0, 0x90 lsls r0, 5 - bl gpu_pal_alloc_new + bl AllocObjectPalette adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 @@ -303829,7 +303830,7 @@ sub_80AAFA4: ; 80AAFA4 adds r0, r4, r1 strb r5, [r0] ldr r0, =0x00001201 - bl gpu_pal_alloc_new + bl AllocObjectPalette ldr r2, =0x000006d4 adds r1, r4, r2 strb r0, [r1] @@ -306522,7 +306523,7 @@ sub_80AC594: ; 80AC594 cmp r0, 0x1 beq @080AC650 ldr r0, =gUnknown_0854FB5C - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, =gUnknown_0854C290 bl sub_80ABF4C movs r5, 0 @@ -306531,7 +306532,7 @@ sub_80AC594: ; 80AC594 movs r1, 0 movs r2, 0 movs r3, 0xFF - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 @@ -306620,7 +306621,7 @@ sub_80AC660: ; 80AC660 ldr r0, [r0] cmp r0, 0 beq @080AC686 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @080AC686: adds r0, r4, 0x1 lsls r0, 16 @@ -306629,7 +306630,7 @@ sub_80AC660: ; 80AC660 bls @080AC678 movs r0, 0x90 lsls r0, 5 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag ldr r0, =gUnknown_0854C14C ldr r0, [r0] ldr r1, =0x000006de @@ -307188,7 +307189,7 @@ sub_80ACAB0: ; 80ACAB0 strh r0, [r7, 0x34] adds r0, r7, 0 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim mov r3, r8 strh r3, [r7, 0x36] adds r2, r7, 0 @@ -307291,7 +307292,7 @@ sub_80ACB84: ; 80ACB84 lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0x1 strh r0, [r5, 0x36] ldr r1, =0x02021bbc @@ -307449,7 +307450,7 @@ sub_80ACCB4: ; 80ACCB4 sub_80ACD68: ; 80ACD68 push {lr} ldr r0, =gUnknown_0854FC54 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic pop {r0} bx r0 .pool @@ -307481,7 +307482,7 @@ sub_80ACD78: ; 80ACD78 movs r3, 0x2 ldrsh r2, [r2, r3] movs r3, 0x4E - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 @@ -307691,7 +307692,7 @@ sub_80ACF38: ; 80ACF38 ldr r0, [r0] cmp r0, 0 beq @080ACF5E - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @080ACF5E: adds r0, r4, 0x1 lsls r0, 16 @@ -307706,7 +307707,7 @@ sub_80ACF38: ; 80ACF38 movs r1, 0 strb r1, [r0] ldr r0, =0x00001206 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag pop {r4-r7} pop {r0} bx r0 @@ -307942,7 +307943,7 @@ snowflake_add: ; 80AD164 movs r1, 0 movs r2, 0 movs r3, 0x4E - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -308006,7 +308007,7 @@ snowflake_remove: ; 80AD1D0 adds r1, 0x60 adds r1, r0 ldr r0, [r1] - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0x1 @080AD200: pop {r1} @@ -308077,7 +308078,7 @@ sub_80AD204: ; 80AD204 movs r1, 0x1 bics r1, r6 adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim strh r7, [r5, 0x34] movs r0, 0x1 cmp r4, 0 @@ -309254,14 +309255,14 @@ sub_80ADCAC: ; 80ADCAC str r0, [sp] str r1, [sp, 0x4] mov r0, sp - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic movs r5, 0 @080ADCD0: ldr r0, =gUnknown_0854FD18 movs r1, 0 movs r2, 0 movs r3, 0xFF - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -309340,7 +309341,7 @@ sub_80ADD68: ; 80ADD68 ldr r0, [r0] cmp r0, 0 beq @080ADD8C - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @080ADD8C: adds r0, r4, 0x1 lsls r0, 16 @@ -309348,7 +309349,7 @@ sub_80ADD68: ; 80ADD68 cmp r4, 0x13 bls @080ADD7E ldr r0, =0x00001201 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag ldr r0, =gUnknown_0854C14C ldr r0, [r0] ldr r1, =0x000006fb @@ -309569,7 +309570,7 @@ sub_80ADEF4: ; 80ADEF4 sub_80ADF5C: ; 80ADF5C push {lr} ldr r0, =gUnknown_0854FD38 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic pop {r0} bx r0 .pool @@ -309592,7 +309593,7 @@ sub_80ADF6C: ; 80ADF6C movs r1, 0 movs r2, 0 movs r3, 0x4E - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -309676,7 +309677,7 @@ sub_80AE014: ; 80AE014 ldr r0, [r0] cmp r0, 0 beq @080AE03A - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @080AE03A: adds r0, r4, 0x1 lsls r0, 16 @@ -309684,7 +309685,7 @@ sub_80AE014: ; 80AE014 cmp r4, 0x13 bls @080AE02C ldr r0, =0x00001202 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag ldr r0, =gUnknown_0854C14C ldr r0, [r0] movs r1, 0xE0 @@ -310027,7 +310028,7 @@ sub_80AE2F0: ; 80AE2F0 str r0, [sp] str r1, [sp, 0x4] mov r0, sp - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic movs r6, 0 @080AE314: adds r0, r6, 0 @@ -310039,7 +310040,7 @@ sub_80AE2F0: ; 80AE2F0 ldr r0, =gUnknown_0854FD8C movs r1, 0 movs r3, 0xFF - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -310113,7 +310114,7 @@ sub_80AE3A8: ; 80AE3A8 ldr r0, [r0] cmp r0, 0 beq @080AE3CE - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @080AE3CE: adds r0, r4, 0x1 lsls r0, 16 @@ -310121,7 +310122,7 @@ sub_80AE3A8: ; 80AE3A8 cmp r4, 0x13 bls @080AE3C0 ldr r0, =0x00001203 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag ldr r0, =gUnknown_0854C14C ldr r0, [r0] ldr r1, =0x00000724 @@ -310473,7 +310474,7 @@ sub_80AE6A4: ; 80AE6A4 ldr r0, [r0] cmp r0, 0 beq @080AE6CA - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @080AE6CA: adds r0, r4, 0x1 lsls r0, 16 @@ -310487,7 +310488,7 @@ sub_80AE6A4: ; 80AE6A4 movs r1, 0 strb r1, [r0] ldr r0, =0x00001204 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag @080AE6E6: ldr r0, =gUnknown_0854C14C ldr r1, [r0] @@ -310506,7 +310507,7 @@ sub_80AE6A4: ; 80AE6A4 ldr r0, [r0] cmp r0, 0 beq @080AE70A - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @080AE70A: adds r0, r4, 0x1 lsls r0, 16 @@ -310538,7 +310539,7 @@ sub_80AE738: ; 80AE738 cmp r0, 0 bne @080AE7E6 ldr r0, =gUnknown_0854FDDC - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, =gUnknown_0854C2B0 bl sub_80ABF4C movs r7, 0 @@ -310552,7 +310553,7 @@ sub_80AE738: ; 80AE738 ldr r0, =gUnknown_0854FDC4 movs r1, 0 movs r3, 0x1 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -310639,7 +310640,7 @@ sub_80AE7F8: ; 80AE7F8 ldr r0, =gUnknown_0854FDC4 movs r2, 0xD0 movs r3, 0x1 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -310682,12 +310683,12 @@ sub_80AE7F8: ; 80AE7F8 strh r0, [r1, 0x34] ldr r0, [r4] movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, [r4] movs r1, 0 movs r2, 0x2 movs r3, 0 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft ldr r1, [r4] ldr r0, =sub_80AE958 str r0, [r1, 0x1C] @@ -310906,7 +310907,7 @@ sub_80AEA34: ; 80AEA34 cmp r5, 0 bne @080AEA6C ldr r0, =gUnknown_0854FDF8 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic movs r2, 0xE5 lsls r2, 3 adds r0, r4, r2 @@ -311041,7 +311042,7 @@ sub_80AEB48: ; 80AEB48 lsls r2, 16 asrs r2, 16 movs r3, 0 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -311106,7 +311107,7 @@ sub_80AEBD0: ; 80AEBD0 cmp r1, r0 bne @080AEBFE adds r0, r2, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @080AEBFE: adds r0, r4, 0x1 lsls r0, 16 @@ -311114,7 +311115,7 @@ sub_80AEBD0: ; 80AEBD0 cmp r4, 0x3F bls @080AEBE4 ldr r0, =0x00001205 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag ldr r0, =gUnknown_0854C14C ldr r0, [r0] ldr r1, =0x0000072c @@ -311175,7 +311176,7 @@ unc_0807DAB4: ; 80AEC34 cmp r0, 0x77 ble @080AEC8E adds r0, r1, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @080AEC8E: pop {r0} bx r0 @@ -314861,7 +314862,7 @@ sub_80B0AF8: ; 80B0AF8 bl CpuSet movs r0, 0 movs r1, 0x80 - bl reset_super_sprites + bl ResetSpriteRange ldr r0, =0x0202433a ldrb r0, [r0] bl battle_exit_is_player_defeat @@ -314906,7 +314907,7 @@ sub_80B0B6C: ; 80B0B6C bl CpuSet movs r0, 0 movs r1, 0x80 - bl reset_super_sprites + bl ResetSpriteRange ldr r0, =0x0202433a ldrb r0, [r0] bl battle_exit_is_player_defeat @@ -321981,7 +321982,7 @@ oei_exclamation_mark: ; 80B4620 movs r1, 0 movs r2, 0 movs r3, 0x53 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -322008,7 +322009,7 @@ sub_80B4658: ; 80B4658 movs r1, 0 movs r2, 0 movs r3, 0x52 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -322035,7 +322036,7 @@ sub_80B4690: ; 80B4690 movs r1, 0 movs r2, 0 movs r3, 0x52 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -322095,7 +322096,7 @@ sub_80B46D8: ; 80B46D8 strh r3, [r0, 0x34] strh r1, [r0, 0x3C] adds r1, r2, 0 - bl obj_anim_image_start + bl StartObjectImageAnim pop {r4} pop {r0} bx r0 @@ -324822,13 +324823,13 @@ FieldEffectScript_LoadTiles: ; 80B5C3C bl FieldEffectScript_ReadWord adds r5, r0, 0 ldrh r0, [r5, 0x6] - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 bne @080B5C5A adds r0, r5, 0 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic @080B5C5A: ldr r0, [r4] adds r0, 0x4 @@ -324846,9 +324847,9 @@ FieldEffectScript_LoadFadedPalette: ; 80B5C6C adds r5, r0, 0 bl FieldEffectScript_ReadWord adds r4, r0, 0 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette ldrh r0, [r4, 0x4] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 24 bl sub_80ABE18 @@ -324866,7 +324867,7 @@ FieldEffectScript_LoadPalette: ; 80B5C94 push {r4,lr} adds r4, r0, 0 bl FieldEffectScript_ReadWord - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette ldr r0, [r4] adds r0, 0x4 str r0, [r4] @@ -324901,7 +324902,7 @@ FieldEffectFreeGraphicsResources: ; 80B5CC8 ldrh r5, [r1] ldrb r4, [r0, 0x5] lsrs r4, 4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r5, 0 bl FieldEffectFreeTilesIfUnused adds r0, r4, 0 @@ -324932,7 +324933,7 @@ FieldEffectFreeTilesIfUnused: ; 80B5D04 lsls r0, 16 lsrs r4, r0, 16 adds r0, r4, 0 - bl gpu_tile_obj_tag_get_by_range_start + bl GetTagByObjectTileRangeStart lsls r0, 16 lsrs r3, r0, 16 ldr r0, =0x0000ffff @@ -324969,7 +324970,7 @@ FieldEffectFreeTilesIfUnused: ; 80B5D04 cmp r2, 0x3F bls @080B5D1E adds r0, r3, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag @080B5D58: pop {r4,r5} pop {r0} @@ -324984,7 +324985,7 @@ FieldEffectFreePaletteIfUnused: ; 80B5D68 lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 - bl gpu_pal_tag_by_index + bl GetObjectPaletteTagBySlot lsls r0, 16 lsrs r5, r0, 16 ldr r0, =0x0000ffff @@ -325015,7 +325016,7 @@ FieldEffectFreePaletteIfUnused: ; 80B5D68 cmp r2, 0x3F bls @080B5D84 adds r0, r5, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag @080B5DB0: pop {r4-r6} pop {r0} @@ -325159,12 +325160,12 @@ sub_80B5E6C: ; 80B5E6C add r8, r4 mov r0, r8 adds r1, r7, 0 - bl gpu_pal_obj_decompress_and_apply2 + bl LoadCompressedObjectPaletteOverrideBuffer ldr r0, =gTrainerFrontPicTable adds r4, r0 adds r0, r4, 0 adds r1, r7, 0 - bl gpu_tile_obj_decompress_and_load2 + bl LoadCompressedObjectPicOverrideBuffer mov r1, sp ldrh r0, [r4, 0x6] movs r2, 0 @@ -325189,7 +325190,7 @@ sub_80B5E6C: ; 80B5E6C adds r1, r5, 0 adds r2, r6, 0 mov r3, r9 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 add sp, 0x18 @@ -325215,7 +325216,7 @@ sub_80B5F0C: ; 80B5F0C lsrs r4, 21 adds r0, r4, r0 ldr r0, [r0] - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gTrainerFrontPicPaletteTable adds r4, r0 ldr r0, [r4] @@ -325241,7 +325242,7 @@ AddNewGameBirchObject: ; 80B5F44 lsls r6, 24 lsrs r6, 24 ldr r0, =gNewGameBirchObjectPaletteInfo - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette ldr r0, =gNewGameBirchObjectTemplate lsls r4, 16 asrs r4, 16 @@ -325250,7 +325251,7 @@ AddNewGameBirchObject: ; 80B5F44 adds r1, r4, 0 adds r2, r5, 0 adds r3, r6, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 pop {r4-r6} @@ -325287,7 +325288,7 @@ sub_80B5F84: ; 80B5F84 lsls r0, 16 lsrs r5, r0, 16 ldrh r0, [r4, 0x4] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag adds r0, 0x10 lsls r0, 24 lsrs r0, 24 @@ -325350,7 +325351,7 @@ sub_80B5FE8: ; 80B5FE8 lsrs r4, r0, 16 mov r1, r8 ldrh r0, [r1, 0x4] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag adds r0, 0x10 lsls r0, 24 lsrs r0, 24 @@ -325688,7 +325689,7 @@ sub_80B62B4: ; 80B62B4 cmp r0, 0x6 ble @080B62E6 adds r0, r1, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0x19 bl FieldEffectActiveListRemove ldr r0, =sub_80B61E4 @@ -325874,7 +325875,7 @@ sub_80B642C: ; 80B642C cmp r0, 0x6 ble @080B645E adds r0, r1, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0x3E bl FieldEffectActiveListRemove ldr r0, =sub_80B6330 @@ -325978,7 +325979,7 @@ sub_80B64DC: ; 80B64DC lsls r2, 16 asrs r2, 16 movs r3, 0 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 ldr r2, =0x02020630 @@ -326086,7 +326087,7 @@ sub_80B65A8: ; 80B65A8 ldr r3, =0x00001007 mov r10, r3 mov r0, r10 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 4 movs r1, 0x84 @@ -326109,7 +326110,7 @@ sub_80B65A8: ; 80B65A8 mov r0, r8 ands r4, r0 mov r0, r10 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 4 movs r1, 0x83 @@ -326128,7 +326129,7 @@ sub_80B65A8: ; 80B65A8 mov r3, r8 ands r4, r3 mov r0, r10 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 4 movs r1, 0x81 @@ -326146,7 +326147,7 @@ sub_80B65A8: ; 80B65A8 lsls r4, 24 lsrs r4, 24 mov r0, r10 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 4 ldr r3, =0x01050000 @@ -326163,7 +326164,7 @@ sub_80B65A8: ; 80B65A8 adds r3, r4, 0 bl sub_80B609C mov r0, r10 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 4 ldr r1, =0x01030000 @@ -326227,7 +326228,7 @@ sub_80B66E8: ; 80B66E8 lsrs r4, 24 ldr r0, =0x00001007 mov r8, r0 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 4 movs r1, 0x84 @@ -326248,7 +326249,7 @@ sub_80B66E8: ; 80B66E8 adds r3, r4, 0 bl sub_80B609C mov r0, r8 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 4 movs r1, 0x83 @@ -326260,7 +326261,7 @@ sub_80B66E8: ; 80B66E8 adds r3, r4, 0 bl sub_80B609C mov r0, r8 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 4 movs r1, 0x81 @@ -326272,7 +326273,7 @@ sub_80B66E8: ; 80B66E8 adds r3, r4, 0 bl sub_80B609C mov r0, r8 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 4 ldr r1, =0x01050000 @@ -326283,7 +326284,7 @@ sub_80B66E8: ; 80B66E8 adds r3, r4, 0 bl sub_80B609C mov r0, r8 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 4 ldr r1, =0x01030000 @@ -326389,7 +326390,7 @@ sub_80B6850: ; 80B6850 asrs r2, 16 adds r1, r3, 0 movs r3, 0 - bl obj_add_from_template_backward_search + bl AddObjectToBack adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -326412,7 +326413,7 @@ sub_80B6850: ; 80B6850 orrs r1, r2 strb r1, [r3] ldr r1, =gUnknown_0855C2AC - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable adds r0, r4, 0 pop {r4} pop {r1} @@ -326438,7 +326439,7 @@ sub_80B68AC: ; 80B68AC strb r0, [r2] adds r0, r4, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim @080B68D0: adds r0, r4, 0 adds r0, 0x3F @@ -326473,7 +326474,7 @@ sub_80B68EC: ; 80B68EC lsls r2, 16 asrs r2, 16 movs r3, 0 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r4, r0, 24 lsls r0, r4, 4 @@ -326482,7 +326483,7 @@ sub_80B68EC: ; 80B68EC ldr r1, =0x02020630 adds r0, r1 ldr r1, =gUnknown_0855C2C4 - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable b @080B6948 .pool @080B6934: @@ -326492,7 +326493,7 @@ sub_80B68EC: ; 80B68EC lsls r2, 16 asrs r2, 16 movs r3, 0 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r4, r0, 24 @080B6948: @@ -328583,7 +328584,7 @@ sub_80B79F4: ; 80B79F4 movs r3, 0x4 ldrsh r2, [r4, r3] ldrb r3, [r4, 0x8] - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 ldr r1, =0x02020630 @@ -328870,7 +328871,7 @@ sub_80B7C48: ; 80B7C48 movs r3, 0x4 ldrsh r2, [r4, r3] ldrb r3, [r4, 0x8] - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 ldr r1, =0x02020630 @@ -331189,7 +331190,7 @@ sub_80B8F98: ; 80B8F98 negs r2, r2 movs r1, 0x78 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 mov r8, r0 @@ -331318,7 +331319,7 @@ sub_80B90CC: ; 80B90CC movs r1, 0x78 movs r2, 0 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -331678,7 +331679,7 @@ sub_80B9390: ; 80B9390 ldr r6, =0x02020630 adds r0, r6 movs r1, 0x16 - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r0, [r4, 0x1] movs r1, 0x10 orrs r0, r1 @@ -331696,7 +331697,7 @@ sub_80B9390: ; 80B9390 adds r0, r1 lsls r0, 2 adds r0, r6 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @080B93FC: ldrh r0, [r5, 0x8] adds r0, 0x1 @@ -331803,7 +331804,7 @@ sub_80B94C4: ; 80B94C4 movs r1, 0xFF movs r2, 0xB4 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r2, r0, 4 @@ -331972,7 +331973,7 @@ sub_80B957C: ; 80B957C lsrs r2, 6 adds r0, r4, 0 movs r3, 0 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft @080B9628: pop {r4} pop {r0} @@ -332271,7 +332272,7 @@ sub_80B9804: ; 80B9804 ldr r1, =0x02020630 adds r0, r1 movs r1, 0x16 - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r1, [r4, 0x1] movs r0, 0x21 negs r0, r0 @@ -332483,7 +332484,7 @@ sub_80B9A28: ; 80B9A28 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -332869,7 +332870,7 @@ sub_80B9D24: ; 80B9D24 asrs r1, r2, 16 asrs r2, r7, 16 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -332882,7 +332883,7 @@ sub_80B9D24: ; 80B9D24 lsls r1, r5, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim strh r5, [r4, 0x2E] ldrb r1, [r6, 0x5] lsrs r1, 4 @@ -332967,7 +332968,7 @@ sub_80B9DB8: ; 80B9DB8 ble @080B9E24 @080B9E1E: adds r0, r1, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @080B9E24: pop {r0} bx r0 @@ -333753,8 +333754,8 @@ sub_80BA384: ; 80BA384 sub_80BA4B0: ; 80BA4B0 push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r0} bx r0 @@ -333763,8 +333764,8 @@ sub_80BA4B0: ; 80BA4B0 thumb_func_start sub_80BA4C8 sub_80BA4C8: ; 80BA4C8 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -333956,7 +333957,7 @@ c2_options_menu: ; 80BA4DC bl sub_80A1A74 bl remove_some_task bl clear_tasks - bl reset_all_obj_data + bl ResetAllObjectData ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -334007,7 +334008,7 @@ c2_options_menu: ; 80BA4DC .pool @080BA728: movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap bl sub_80BB0D0 ldr r1, =0x030022c0 movs r0, 0x87 @@ -334022,7 +334023,7 @@ c2_options_menu: ; 80BA4DC b @080BA7F4 @080BA748: movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap bl sub_80BB104 ldr r1, =0x030022c0 movs r2, 0x87 @@ -335283,7 +335284,7 @@ sub_80BB154: ; 80BB154 lsls r1, 1 movs r2, 0x1 movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r0, 0x1B mov r8, r0 str r0, [sp] @@ -335293,7 +335294,7 @@ sub_80BB154: ; 80BB154 ldr r1, =0x000001a3 movs r2, 0x2 movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -335302,7 +335303,7 @@ sub_80BB154: ; 80BB154 lsls r1, 1 movs r2, 0x1C movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] movs r6, 0x2 str r6, [sp, 0x4] @@ -335311,7 +335312,7 @@ sub_80BB154: ; 80BB154 ldr r1, =0x000001a5 movs r2, 0x1 movs r3, 0x1 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r6, [sp, 0x4] str r5, [sp, 0x8] @@ -335319,7 +335320,7 @@ sub_80BB154: ; 80BB154 ldr r1, =0x000001a7 movs r2, 0x1C movs r3, 0x1 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r7, 0xD4 lsls r7, 1 str r4, [sp] @@ -335329,7 +335330,7 @@ sub_80BB154: ; 80BB154 adds r1, r7, 0 movs r2, 0x1 movs r3, 0x3 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r0, =0x000001a9 mov r10, r0 mov r0, r8 @@ -335340,7 +335341,7 @@ sub_80BB154: ; 80BB154 mov r1, r10 movs r2, 0x2 movs r3, 0x3 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r0, 0xD5 lsls r0, 1 mov r9, r0 @@ -335351,7 +335352,7 @@ sub_80BB154: ; 80BB154 mov r1, r9 movs r2, 0x1C movs r3, 0x3 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -335360,7 +335361,7 @@ sub_80BB154: ; 80BB154 lsls r1, 1 movs r2, 0x1 movs r3, 0x4 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r0, 0x1A mov r8, r0 str r0, [sp] @@ -335370,7 +335371,7 @@ sub_80BB154: ; 80BB154 ldr r1, =0x000001a3 movs r2, 0x2 movs r3, 0x4 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -335379,7 +335380,7 @@ sub_80BB154: ; 80BB154 lsls r1, 1 movs r2, 0x1C movs r3, 0x4 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] movs r6, 0x12 str r6, [sp, 0x4] @@ -335388,7 +335389,7 @@ sub_80BB154: ; 80BB154 ldr r1, =0x000001a5 movs r2, 0x1 movs r3, 0x5 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r6, [sp, 0x4] str r5, [sp, 0x8] @@ -335396,7 +335397,7 @@ sub_80BB154: ; 80BB154 ldr r1, =0x000001a7 movs r2, 0x1C movs r3, 0x5 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -335404,7 +335405,7 @@ sub_80BB154: ; 80BB154 adds r1, r7, 0 movs r2, 0x1 movs r3, 0x13 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect mov r0, r8 str r0, [sp] str r4, [sp, 0x4] @@ -335413,7 +335414,7 @@ sub_80BB154: ; 80BB154 mov r1, r10 movs r2, 0x2 movs r3, 0x13 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -335421,9 +335422,9 @@ sub_80BB154: ; 80BB154 mov r1, r9 movs r2, 0x1C movs r3, 0x13 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0xC pop {r3-r5} mov r8, r3 @@ -335509,8 +335510,8 @@ sub_80BB358: ; 80BB358 thumb_func_start sub_80BB370 sub_80BB370: ; 80BB370 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -335811,9 +335812,9 @@ sub_80BB534: ; 80BB534 @080BB5FC: bl remove_some_task bl clear_tasks - bl reset_all_obj_data + bl ResetAllObjectData bl sub_80A1A74 - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator ldr r1, =0x0300301c movs r0, 0x8 strb r0, [r1] @@ -335945,8 +335946,8 @@ sub_80BB534: ; 80BB534 sub_80BB774: ; 80BB774 push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r0} bx r0 @@ -337468,22 +337469,22 @@ sub_80BC514: ; 80BC514 bl AllocZeroed adds r1, r0, 0 movs r0, 0x3 - bl SetBgTileMap + bl SetBgTilemap adds r0, r4, 0 bl AllocZeroed adds r1, r0, 0 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap adds r0, r4, 0 bl AllocZeroed adds r1, r0, 0 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap adds r0, r4, 0 bl AllocZeroed adds r1, r0, 0 movs r0, 0 - bl SetBgTileMap + bl SetBgTilemap ldr r1, =gUnknown_08DC1934 movs r2, 0x80 lsls r2, 6 @@ -337495,12 +337496,12 @@ sub_80BC514: ; 80BC514 movs r0, 0x1 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer ldr r1, =gUnknown_08DC2DAC movs r0, 0x3 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer cmp r5, 0 bne @080BC640 ldr r1, =gUnknown_08DC2A08 @@ -337508,7 +337509,7 @@ sub_80BC514: ; 80BC514 lsls r3, 2 movs r0, 0 movs r2, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer b @080BC64E .pool @080BC640: @@ -337517,7 +337518,7 @@ sub_80BC514: ; 80BC514 lsls r3, 2 movs r0, 0 movs r2, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer @080BC64E: bl sub_80A1A74 cmp r5, 0 @@ -337553,7 +337554,7 @@ sub_80BC514: ; 80BC514 bl InitWindows bl DeactivateAllTextPrinters movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 movs r1, 0x3 bl CopyWindowToVram @@ -337566,15 +337567,15 @@ sub_80BC514: ; 80BC514 b @080BC838 .pool @080BC6CC: - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator ldr r1, =0x0300301c movs r0, 0x8 strb r0, [r1] ldr r0, =gUnknown_0855D26C - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_0855D27C - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes adds r0, r5, 0 bl sub_80BDB7C b @080BC7F8 @@ -337614,13 +337615,13 @@ sub_80BC514: ; 80BC514 adds r0, r2 strh r1, [r0] movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @080BC7F8 .pool @080BC768: @@ -337755,25 +337756,25 @@ sub_80BC890: ; 80BC890 push {lr} bl FreeAllWindowBuffers movs r0, 0 - bl GetBgTileMap + bl GetBgTilemap cmp r0, 0 beq @080BC8A4 bl Free @080BC8A4: movs r0, 0x1 - bl GetBgTileMap + bl GetBgTilemap cmp r0, 0 beq @080BC8B2 bl Free @080BC8B2: movs r0, 0x2 - bl GetBgTileMap + bl GetBgTilemap cmp r0, 0 beq @080BC8C0 bl Free @080BC8C0: movs r0, 0x3 - bl GetBgTileMap + bl GetBgTilemap cmp r0, 0 beq @080BC8CE bl Free @@ -340030,7 +340031,7 @@ sub_80BDB7C: ; 80BDB7C movs r1, 0xB8 movs r2, 0x4 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 ldr r1, =0x02020630 @@ -340045,7 +340046,7 @@ sub_80BDB7C: ; 80BDB7C movs r1, 0xB8 movs r2, 0x9C movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 lsls r0, r7, 4 @@ -340063,18 +340064,18 @@ sub_80BDB7C: ; 80BDB7C movs r1, 0xE6 movs r2, 0x14 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r5, =gUnknown_0855D1C4 adds r0, r5, 0 movs r1, 0x10 movs r2, 0x78 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r0, r5, 0 movs r1, 0x30 movs r2, 0x78 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 lsls r0, r7, 4 @@ -340082,12 +340083,12 @@ sub_80BDB7C: ; 80BDB7C lsls r0, 2 add r0, r10 movs r1, 0x3 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r5, 0 movs r1, 0x10 movs r2, 0x90 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 lsls r4, r7, 4 @@ -340096,7 +340097,7 @@ sub_80BDB7C: ; 80BDB7C add r4, r10 adds r0, r4, 0 movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0x80 mov r9, r0 mov r1, r9 @@ -340105,7 +340106,7 @@ sub_80BDB7C: ; 80BDB7C movs r1, 0x30 movs r2, 0x90 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 lsls r0, r7, 4 @@ -340113,13 +340114,13 @@ sub_80BDB7C: ; 80BDB7C lsls r0, 2 add r0, r10 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r6, =gUnknown_0855D1DC adds r0, r6, 0 movs r1, 0 movs r2, 0x50 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 lsls r1, r7, 4 @@ -340149,7 +340150,7 @@ sub_80BDB7C: ; 80BDB7C movs r1, 0 movs r2, 0x50 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 lsls r1, r7, 4 @@ -340183,12 +340184,12 @@ sub_80BDB7C: ; 80BDB7C movs r1, 0x20 movs r2, 0x28 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r0, r4, 0 movs r1, 0x20 movs r2, 0x48 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 lsls r0, r7, 4 @@ -340196,14 +340197,14 @@ sub_80BDB7C: ; 80BDB7C lsls r0, 2 add r0, r10 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0 mov r8, r0 ldr r0, =gUnknown_0855D224 movs r1, 0x18 movs r2, 0x30 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 ldr r0, =0x02039b4c @@ -340223,7 +340224,7 @@ sub_80BDB7C: ; 80BDB7C lsls r1, r5, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim cmp r5, 0 beq @080BDD6C movs r0, 0x1 @@ -340242,7 +340243,7 @@ sub_80BDB7C: ; 80BDB7C movs r1, 0x20 movs r2, 0x30 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 ldr r0, =0x02039b4c @@ -340271,7 +340272,7 @@ sub_80BDB7C: ; 80BDB7C adds r0, r1 lsls r1, r5, 24 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim b @080BDDE8 .pool @080BDDD4: @@ -340291,7 +340292,7 @@ sub_80BDB7C: ; 80BDB7C movs r1, 0x28 movs r2, 0x30 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 ldr r5, =0x02039b4c @@ -340313,14 +340314,14 @@ sub_80BDB7C: ; 80BDB7C adds r0, r4 lsls r1, 24 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0 mov r8, r0 adds r0, r6, 0 movs r1, 0x18 movs r2, 0x50 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 ldr r0, [r5] @@ -340338,7 +340339,7 @@ sub_80BDB7C: ; 80BDB7C lsls r1, r5, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim cmp r5, 0 beq @080BDE80 movs r0, 0x1 @@ -340357,7 +340358,7 @@ sub_80BDB7C: ; 80BDB7C movs r1, 0x20 movs r2, 0x50 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 ldr r0, =0x02039b4c @@ -340386,7 +340387,7 @@ sub_80BDB7C: ; 80BDB7C adds r0, r1 lsls r1, r5, 24 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim b @080BDEFC .pool @080BDEE8: @@ -340405,7 +340406,7 @@ sub_80BDB7C: ; 80BDB7C movs r1, 0x28 movs r2, 0x50 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 ldr r0, =0x02039b4c @@ -340427,7 +340428,7 @@ sub_80BDB7C: ; 80BDB7C adds r0, r2 lsls r1, 24 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim b @080BE3E2 .pool @080BDF4C: @@ -340436,12 +340437,12 @@ sub_80BDB7C: ; 80BDB7C movs r1, 0x20 movs r2, 0x28 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r0, r4, 0 movs r1, 0x20 movs r2, 0x4C movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 lsls r0, r7, 4 @@ -340449,18 +340450,18 @@ sub_80BDB7C: ; 80BDB7C lsls r0, 2 add r0, r10 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r4, =gUnknown_0855D20C adds r0, r4, 0 movs r1, 0x11 movs r2, 0x2D movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r0, r4, 0 movs r1, 0x11 movs r2, 0x37 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 lsls r0, r7, 4 @@ -340468,17 +340469,17 @@ sub_80BDB7C: ; 80BDB7C lsls r0, 2 add r0, r10 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r4, 0 movs r1, 0x11 movs r2, 0x51 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r0, r4, 0 movs r1, 0x11 movs r2, 0x5B movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 lsls r0, r7, 4 @@ -340486,7 +340487,7 @@ sub_80BDB7C: ; 80BDB7C lsls r0, 2 add r0, r10 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0 bl sub_80C0844 lsls r0, 16 @@ -340497,7 +340498,7 @@ sub_80BDB7C: ; 80BDB7C movs r1, 0x28 movs r2, 0x2D movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 adds r0, r6, 0 @@ -340513,7 +340514,7 @@ sub_80BDB7C: ; 80BDB7C lsls r1, r5, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim cmp r5, 0 beq @080BE024 movs r0, 0x1 @@ -340532,7 +340533,7 @@ sub_80BDB7C: ; 80BDB7C movs r1, 0x30 movs r2, 0x2D movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 adds r0, r6, 0 @@ -340557,7 +340558,7 @@ sub_80BDB7C: ; 80BDB7C adds r0, r1 lsls r1, r5, 24 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim b @080BE090 .pool @080BE07C: @@ -340577,7 +340578,7 @@ sub_80BDB7C: ; 80BDB7C movs r1, 0x38 movs r2, 0x2D movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 adds r0, r6, 0 @@ -340595,14 +340596,14 @@ sub_80BDB7C: ; 80BDB7C adds r0, r4 lsls r1, 24 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0 mov r8, r0 adds r0, r5, 0 movs r1, 0x28 movs r2, 0x37 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 ldr r0, =0x02039b4c @@ -340621,7 +340622,7 @@ sub_80BDB7C: ; 80BDB7C lsls r1, r5, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim cmp r5, 0 beq @080BE11C movs r0, 0x1 @@ -340640,7 +340641,7 @@ sub_80BDB7C: ; 80BDB7C movs r1, 0x30 movs r2, 0x37 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 ldr r0, =0x02039b4c @@ -340669,7 +340670,7 @@ sub_80BDB7C: ; 80BDB7C adds r0, r1 lsls r1, r5, 24 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim b @080BE198 .pool @080BE184: @@ -340689,7 +340690,7 @@ sub_80BDB7C: ; 80BDB7C movs r1, 0x38 movs r2, 0x37 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 ldr r0, =0x02039b4c @@ -340711,7 +340712,7 @@ sub_80BDB7C: ; 80BDB7C adds r0, r4 lsls r1, 24 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0x1 bl sub_80C0844 lsls r0, 16 @@ -340722,7 +340723,7 @@ sub_80BDB7C: ; 80BDB7C movs r1, 0x28 movs r2, 0x51 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 adds r0, r6, 0 @@ -340737,7 +340738,7 @@ sub_80BDB7C: ; 80BDB7C lsls r1, r5, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim cmp r5, 0 beq @080BE230 movs r1, 0x1 @@ -340756,7 +340757,7 @@ sub_80BDB7C: ; 80BDB7C movs r1, 0x30 movs r2, 0x51 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 adds r0, r6, 0 @@ -340781,7 +340782,7 @@ sub_80BDB7C: ; 80BDB7C adds r0, r1 lsls r1, r5, 24 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim b @080BE29C .pool @080BE288: @@ -340801,7 +340802,7 @@ sub_80BDB7C: ; 80BDB7C movs r1, 0x38 movs r2, 0x51 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 adds r0, r6, 0 @@ -340819,14 +340820,14 @@ sub_80BDB7C: ; 80BDB7C adds r0, r4 lsls r1, 24 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim movs r1, 0 mov r8, r1 adds r0, r5, 0 movs r1, 0x28 movs r2, 0x5B movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 ldr r0, =0x02039b4c @@ -340845,7 +340846,7 @@ sub_80BDB7C: ; 80BDB7C lsls r1, r5, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim cmp r5, 0 beq @080BE328 movs r0, 0x1 @@ -340864,7 +340865,7 @@ sub_80BDB7C: ; 80BDB7C movs r1, 0x30 movs r2, 0x5B movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 ldr r0, =0x02039b4c @@ -340893,7 +340894,7 @@ sub_80BDB7C: ; 80BDB7C adds r0, r1 lsls r1, r5, 24 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim b @080BE3A4 .pool @080BE390: @@ -340912,7 +340913,7 @@ sub_80BDB7C: ; 80BDB7C movs r1, 0x38 movs r2, 0x5B movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 ldr r0, =0x02039b4c @@ -340934,13 +340935,13 @@ sub_80BDB7C: ; 80BDB7C adds r0, r2 lsls r1, 24 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim @080BE3E2: ldr r0, =gUnknown_0855D254 movs r1, 0x88 movs r2, 0x60 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 ldr r1, =0x02020630 @@ -340955,7 +340956,7 @@ sub_80BDB7C: ; 80BDB7C movs r1, 0x88 movs r2, 0x50 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 lsls r0, r7, 4 @@ -340995,7 +340996,7 @@ sub_80BE44C: ; 80BE44C cmp r0, 0 beq @080BE464 adds r0, r1, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @080BE464: pop {r0} bx r0 @@ -341136,7 +341137,7 @@ sub_80BE4E0: ; 80BE4E0 str r2, [sp] movs r2, 0 movs r3, 0 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix adds r1, r6, 0x1 movs r0, 0x1F ands r1, r0 @@ -341218,7 +341219,7 @@ sub_80BE604: ; 80BE604 cmp r0, 0x3 beq @080BE62C adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles b @080BE648 .pool @080BE62C: @@ -341257,7 +341258,7 @@ sub_80BE658: ; 80BE658 cmp r0, 0x3 beq @080BE680 adds r0, r3, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles b @080BE750 .pool @080BE680: @@ -341388,7 +341389,7 @@ sub_80BE758: ; 80BE758 cmp r0, 0x3 beq @080BE774 adds r0, r1, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @080BE774: pop {r0} bx r0 @@ -341411,7 +341412,7 @@ sub_80BE780: ; 80BE780 cmp r0, 0x3 beq @080BE7AC adds r0, r6, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles b @080BE824 .pool @080BE7AC: @@ -341439,7 +341440,7 @@ sub_80BE780: ; 80BE780 negs r3, r3 lsrs r3, 16 str r1, [sp] - bl rotscale_set_direct + bl SetSpriteTransformationMatrix ldr r1, [r7] adds r1, r5 ldrh r0, [r6, 0x30] @@ -341498,7 +341499,7 @@ sub_80BE834: ; 80BE834 cmp r2, 0x3 beq @080BE85C adds r0, r3, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles b @080BE8D4 .pool @080BE85C: @@ -341639,22 +341640,22 @@ sub_80BE91C: ; 80BE91C bl AllocZeroed adds r1, r0, 0 movs r0, 0x3 - bl SetBgTileMap + bl SetBgTilemap adds r0, r4, 0 bl AllocZeroed adds r1, r0, 0 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap adds r0, r4, 0 bl AllocZeroed adds r1, r0, 0 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap adds r0, r4, 0 bl AllocZeroed adds r1, r0, 0 movs r0, 0 - bl SetBgTileMap + bl SetBgTilemap ldr r0, =gUnknown_0856E640 bl InitWindows bl DeactivateAllTextPrinters @@ -341811,14 +341812,14 @@ sub_80BEA24: ; 80BEA24 movs r0, 0x3 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer movs r0, 0 movs r1, 0 bl FillWindowPixelBuffer movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap ldr r0, =0x02039b54 ldr r0, [r0] ldrh r1, [r0] @@ -341893,11 +341894,11 @@ sub_80BEA24: ; 80BEA24 movs r1, 0x3 bl CopyWindowToVram movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 @@ -342098,25 +342099,25 @@ sub_80BEDB0: ; 80BEDB0 push {lr} bl FreeAllWindowBuffers movs r0, 0 - bl GetBgTileMap + bl GetBgTilemap cmp r0, 0 beq @080BEDC4 bl Free @080BEDC4: movs r0, 0x1 - bl GetBgTileMap + bl GetBgTilemap cmp r0, 0 beq @080BEDD2 bl Free @080BEDD2: movs r0, 0x2 - bl GetBgTileMap + bl GetBgTilemap cmp r0, 0 beq @080BEDE0 bl Free @080BEDE0: movs r0, 0x3 - bl GetBgTileMap + bl GetBgTilemap cmp r0, 0 beq @080BEDEE bl Free @@ -342699,16 +342700,16 @@ sub_80BF250: ; 80BF250 movs r0, 0x3 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer movs r0, 0 movs r1, 0 bl FillWindowPixelBuffer movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x3 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x2 - bl PutWindowTileMap + bl PutWindowTilemap ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 @@ -342876,13 +342877,13 @@ sub_80BF250: ; 80BF250 movs r1, 0x3 bl CopyWindowToVram movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @080BF5B2 .pool @080BF514: @@ -343298,12 +343299,12 @@ sub_80BF82C: ; 80BF82C movs r0, 0x3 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer movs r0, 0 movs r1, 0 bl FillWindowPixelBuffer movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap b @080BFB4E .pool @080BF910: @@ -343402,7 +343403,7 @@ sub_80BF82C: ; 80BF82C movs r0, 0x1 movs r2, 0 movs r3, 0 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix ldr r0, =gUnknown_0856E610 ldrb r1, [r4, 0x5] lsrs r1, 4 @@ -343471,7 +343472,7 @@ sub_80BF82C: ; 80BF82C movs r0, 0x2 movs r2, 0 movs r3, 0 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix ldr r0, =gUnknown_0856E610 ldrb r1, [r4, 0x5] lsrs r1, 4 @@ -343489,11 +343490,11 @@ sub_80BF82C: ; 80BF82C movs r1, 0x3 bl CopyWindowToVram movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @080BFB4E .pool @080BFAE8: @@ -343715,7 +343716,7 @@ sub_80BFCDC: ; 80BFCDC movs r0, 0x1 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer pop {r0} bx r0 .pool @@ -343728,7 +343729,7 @@ sub_80BFCF4: ; 80BFCF4 movs r0, 0x1 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer pop {r0} bx r0 .pool @@ -343743,7 +343744,7 @@ sub_80BFD0C: ; 80BFD0C lsrs r0, 24 mov r8, r0 movs r0, 0x1 - bl GetBgTileMap + bl GetBgTilemap adds r7, r0, 0 movs r1, 0 @080BFD22: @@ -343785,7 +343786,7 @@ sub_80BFD0C: ; 80BFD0C cmp r1, 0x3 bls @080BFD22 movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram pop {r3} mov r8, r3 pop {r4-r7} @@ -343803,7 +343804,7 @@ sub_80BFD7C: ; 80BFD7C lsrs r0, 24 mov r8, r0 movs r0, 0x1 - bl GetBgTileMap + bl GetBgTilemap adds r7, r0, 0 movs r1, 0 @080BFD92: @@ -343850,7 +343851,7 @@ sub_80BFD7C: ; 80BFD7C cmp r1, 0x3 bls @080BFD92 movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram pop {r3} mov r8, r3 pop {r4-r7} @@ -343954,12 +343955,12 @@ sub_80BFE38: ; 80BFE38 bl AllocZeroed adds r1, r0, 0 movs r0, 0x3 - bl SetBgTileMap + bl SetBgTilemap adds r0, r4, 0 bl AllocZeroed adds r1, r0, 0 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap ldr r0, =gUnknown_0856E670 bl InitWindows bl DeactivateAllTextPrinters @@ -343985,14 +343986,14 @@ sub_80BFE38: ; 80BFE38 movs r0, 0x3 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer movs r0, 0 movs r1, 0 bl FillWindowPixelBuffer movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap ldr r0, =0x03005e00 lsls r4, r5, 2 adds r4, r5 @@ -344029,9 +344030,9 @@ sub_80BFE38: ; 80BFE38 movs r1, 0x3 bl CopyWindowToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @080C002E @080BFFA8: adds r0, r4, 0 @@ -344217,13 +344218,13 @@ blockset_load_palette_to_gpu: ; 80C012C bl SetGpuReg bl FreeAllWindowBuffers movs r0, 0x2 - bl GetBgTileMap + bl GetBgTilemap cmp r0, 0 beq @080C015A bl Free @080C015A: movs r0, 0x3 - bl GetBgTileMap + bl GetBgTilemap cmp r0, 0 beq @080C0168 bl Free @@ -345366,8 +345367,8 @@ sub_80C09B0: ; 80C09B0 bne @080C0A7E movs r0, 0 bl ResetGpuRegBits - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator ldr r1, =0x0300301c movs r0, 0x8 strb r0, [r1] @@ -346543,27 +346544,27 @@ sub_80C12E0: ; 80C12E0 bl AllocZeroed adds r1, r0, 0 movs r0, 0x3 - bl SetBgTileMap + bl SetBgTilemap adds r0, r4, 0 bl AllocZeroed adds r1, r0, 0 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap adds r0, r4, 0 bl AllocZeroed adds r1, r0, 0 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap adds r0, r4, 0 bl AllocZeroed adds r1, r0, 0 movs r0, 0 - bl SetBgTileMap + bl SetBgTilemap ldr r0, =gUnknown_0856F008 bl InitWindows bl DeactivateAllTextPrinters movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap ldr r1, =gUnknown_08DC3304 movs r2, 0x80 lsls r2, 6 @@ -346578,7 +346579,7 @@ sub_80C12E0: ; 80C12E0 movs r0, 0x3 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer b @080C13F0 .pool @080C13E4: @@ -346586,7 +346587,7 @@ sub_80C12E0: ; 80C12E0 movs r0, 0x3 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer @080C13F0: ldr r0, =gUnknown_08DC3286 movs r1, 0x1 @@ -346602,9 +346603,9 @@ sub_80C12E0: ; 80C12E0 .pool @080C1414: ldr r0, =gUnknown_0855D26C - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_0855D27C - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes adds r0, r4, 0 bl sub_80C2594 movs r1, 0 @@ -346633,11 +346634,11 @@ sub_80C12E0: ; 80C12E0 movs r1, 0x3 bl CopyWindowToVram movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @080C14DA .pool @080C1480: @@ -346720,25 +346721,25 @@ sub_80C152C: ; 80C152C push {lr} bl FreeAllWindowBuffers movs r0, 0 - bl GetBgTileMap + bl GetBgTilemap cmp r0, 0 beq @080C1540 bl Free @080C1540: movs r0, 0x1 - bl GetBgTileMap + bl GetBgTilemap cmp r0, 0 beq @080C154E bl Free @080C154E: movs r0, 0x2 - bl GetBgTileMap + bl GetBgTilemap cmp r0, 0 beq @080C155C bl Free @080C155C: movs r0, 0x3 - bl GetBgTileMap + bl GetBgTilemap cmp r0, 0 beq @080C156A bl Free @@ -346766,7 +346767,7 @@ sub_80C1570: ; 80C1570 movs r1, 0x2 bl CopyWindowToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, =sub_80C15B0 str r0, [r5] pop {r4,r5} @@ -346869,7 +346870,7 @@ sub_80C15B0: ; 80C15B0 movs r1, 0x2 bl CopyWindowToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @080C167C: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] @@ -346898,7 +346899,7 @@ sub_80C15B0: ; 80C15B0 movs r1, 0x2 bl CopyWindowToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @080C16BC: pop {r4,r5} pop {r0} @@ -346926,7 +346927,7 @@ sub_80C16CC: ; 80C16CC movs r1, 0x2 bl CopyWindowToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, =sub_80C170C str r0, [r5] pop {r4,r5} @@ -347104,7 +347105,7 @@ sub_80C170C: ; 80C170C movs r1, 0x2 bl CopyWindowToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @080C18B6: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] @@ -347138,7 +347139,7 @@ sub_80C170C: ; 80C170C movs r1, 0x2 bl CopyWindowToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @080C1900: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] @@ -347172,7 +347173,7 @@ sub_80C170C: ; 80C170C movs r1, 0x2 bl CopyWindowToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @080C194A: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] @@ -347206,7 +347207,7 @@ sub_80C170C: ; 80C170C movs r1, 0x2 bl CopyWindowToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @080C1994: pop {r4-r7} pop {r0} @@ -347444,7 +347445,7 @@ sub_80C1B64: ; 80C1B64 movs r1, 0x2 bl CopyWindowToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram pop {r4-r6} pop {r0} bx r0 @@ -347516,7 +347517,7 @@ sub_80C1BCC: ; 80C1BCC movs r1, 0x2 bl CopyWindowToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @080C1D2E .pool @080C1C68: @@ -347685,7 +347686,7 @@ sub_80C1D98: ; 80C1D98 lsls r4, 24 lsrs r4, 24 movs r0, 0x3 - bl GetBgTileMap + bl GetBgTilemap adds r2, r0, 0 movs r3, 0 cmp r3, r4 @@ -348180,7 +348181,7 @@ sub_80C21D4: ; 80C21D4 lsls r4, 24 lsrs r4, 24 movs r0, 0x3 - bl GetBgTileMap + bl GetBgTilemap adds r5, r0, 0 cmp r4, 0 bne @080C2268 @@ -348678,7 +348679,7 @@ sub_80C2594: ; 80C2594 movs r1, 0xB8 movs r2, 0x4 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r4, =0x02020630 @@ -348700,7 +348701,7 @@ sub_80C2594: ; 80C2594 movs r1, 0xB8 movs r2, 0x6C movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -348801,8 +348802,8 @@ sub_80C267C: ; 80C267C thumb_func_start sub_80C2690 sub_80C2690: ; 80C2690 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram bl sub_80C48C8 ldr r0, =0x02039ce8 @@ -348857,8 +348858,8 @@ sub_80C26D4: ; 80C26D4 sub_80C2710: ; 80C2710 push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r0} bx r0 @@ -349520,8 +349521,8 @@ sub_80C2C80: ; 80C2C80 b @080C2DCC .pool @080C2D50: - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator bl sub_80A1A74 ldr r1, =0x030022c0 movs r0, 0x87 @@ -351825,7 +351826,7 @@ sub_80C4140: ; 80C4140 str r0, [sp, 0xC] movs r0, 0x3 movs r3, 0xF - bl WriteSequenceToBgTileMapBuffer + bl WriteSequenceToBgTilemapBuffer @080C41B6: adds r0, r4, 0x1 lsls r0, 24 @@ -351991,7 +351992,7 @@ sub_80C42A4: ; 80C42A4 str r0, [sp, 0xC] movs r0, 0x3 movs r3, 0x2 - bl WriteSequenceToBgTileMapBuffer + bl WriteSequenceToBgTilemapBuffer @080C430C: adds r0, r4, 0x1 lsls r0, 24 @@ -352046,7 +352047,7 @@ sub_80C438C: ; 80C438C lsls r4, 24 lsrs r4, 24 adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0 movs r1, 0x3 bl CopyWindowToVram @@ -352174,12 +352175,12 @@ sub_80C43A8: ; 80C43A8 ldr r3, =0x00003ca8 adds r1, r3 movs r0, 0 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x00005ca8 adds r1, r0 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap b @080C4536 .pool @080C4500: @@ -352190,21 +352191,21 @@ sub_80C43A8: ; 80C43A8 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r4, [sp] str r4, [sp, 0x4] movs r0, 0x2 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r4, [sp] str r4, [sp, 0x4] movs r0, 0x3 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 @080C4532: movs r0, 0x1 b @080C4542 @@ -352275,7 +352276,7 @@ sub_80C4550: ; 80C4550 cmp r0, 0x13 ble @080C455E movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram pop {r4-r7} pop {r0} bx r0 @@ -352333,7 +352334,7 @@ sub_80C45C0: ; 80C45C0 cmp r0, 0x13 ble @080C45CE movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram pop {r4-r7} pop {r0} bx r0 @@ -352370,7 +352371,7 @@ sub_80C4630: ; 80C4630 movs r0, 0x3 movs r1, 0x8F movs r2, 0xF - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r0, [r4] ldrb r0, [r0, 0x5] cmp r0, 0 @@ -352400,7 +352401,7 @@ sub_80C4630: ; 80C4630 mov r1, r8 adds r2, r5, 0 movs r3, 0xF - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect mov r1, r8 adds r1, 0x1 lsls r1, 16 @@ -352416,7 +352417,7 @@ sub_80C4630: ; 80C4630 movs r0, 0x3 adds r2, r4, 0 movs r3, 0xF - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect mov r1, r8 adds r1, 0x10 lsls r1, 16 @@ -352428,7 +352429,7 @@ sub_80C4630: ; 80C4630 movs r0, 0x3 adds r2, r5, 0 movs r3, 0x10 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect mov r1, r8 adds r1, 0x11 lsls r1, 16 @@ -352440,7 +352441,7 @@ sub_80C4630: ; 80C4630 movs r0, 0x3 adds r2, r4, 0 movs r3, 0x10 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect @080C4700: adds r0, r7, 0x1 lsls r0, 16 @@ -352462,7 +352463,7 @@ sub_80C4630: ; 80C4630 ble @080C467E @080C4724: movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0xC pop {r3-r5} mov r8, r3 @@ -352496,7 +352497,7 @@ sub_80C474C: ; 80C474C movs r1, 0x8D movs r2, 0x1B movs r3, 0x9 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] str r4, [sp, 0x8] @@ -352504,7 +352505,7 @@ sub_80C474C: ; 80C474C movs r1, 0x9D movs r2, 0x1B movs r3, 0xA - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect @080C478A: ldr r0, [r6] movs r1, 0xAE @@ -352521,7 +352522,7 @@ sub_80C474C: ; 80C474C movs r1, 0x8D movs r2, 0x15 movs r3, 0xD - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] str r4, [sp, 0x8] @@ -352529,7 +352530,7 @@ sub_80C474C: ; 80C474C movs r1, 0x9D movs r2, 0x15 movs r3, 0xE - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect @080C47BE: ldr r0, [r6] ldr r2, =0x00000574 @@ -352545,7 +352546,7 @@ sub_80C474C: ; 80C474C movs r1, 0x8D movs r2, 0x1B movs r3, 0xB - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] str r4, [sp, 0x8] @@ -352553,7 +352554,7 @@ sub_80C474C: ; 80C474C movs r1, 0x9D movs r2, 0x1B movs r3, 0xC - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect b @080C48B8 .pool @080C4800: @@ -352569,7 +352570,7 @@ sub_80C474C: ; 80C474C movs r1, 0x8D movs r2, 0x1B movs r3, 0x9 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -352577,7 +352578,7 @@ sub_80C474C: ; 80C474C movs r1, 0x9D movs r2, 0x1B movs r3, 0xA - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect @080C482E: ldr r0, [r6] movs r1, 0xAA @@ -352595,7 +352596,7 @@ sub_80C474C: ; 80C474C movs r1, 0x8D movs r2, 0x1B movs r3, 0xD - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -352603,7 +352604,7 @@ sub_80C474C: ; 80C474C movs r1, 0x9D movs r2, 0x1B movs r3, 0xE - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect @080C4864: ldr r0, [r6] ldrb r0, [r0, 0xD] @@ -352618,7 +352619,7 @@ sub_80C474C: ; 80C474C movs r1, 0x8D movs r2, 0x11 movs r3, 0xF - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -352626,7 +352627,7 @@ sub_80C474C: ; 80C474C movs r1, 0x9D movs r2, 0x11 movs r3, 0x10 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -352634,7 +352635,7 @@ sub_80C474C: ; 80C474C movs r1, 0x8C movs r2, 0x1B movs r3, 0xF - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -352642,10 +352643,10 @@ sub_80C474C: ; 80C474C movs r1, 0x9C movs r2, 0x1B movs r3, 0x10 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect @080C48B8: movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0xC pop {r4-r6} pop {r0} @@ -352988,7 +352989,7 @@ sub_80C4B08: ; 80C4B08 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 b @080C4BF6 @080C4B6C: ldr r0, [r2] @@ -354019,8 +354020,8 @@ pokemon_details: ; 80C53AC movs r0, 0x2 bl SetBgAffine @080C5416: - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram add sp, 0x10 pop {r4-r7} @@ -354033,8 +354034,8 @@ pokemon_details: ; 80C53AC sub_80C5438: ; 80C5438 push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad pop {r0} bx r0 thumb_func_end sub_80C5438 @@ -354113,8 +354114,8 @@ sub_80C5484: ; 80C5484 b @080C56F4 @080C54F4: bl clear_tasks - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator bl sub_80A1A74 bl reset_temp_tile_data_buffers b @080C56F4 @@ -354132,17 +354133,17 @@ sub_80C5484: ; 80C5484 ldr r1, [r4] adds r1, 0x32 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x00001032 adds r1, r0 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x00002032 adds r1, r0 movs r0, 0x3 - bl SetBgTileMap + bl SetBgTilemap movs r0, 0x2 movs r1, 0x6 movs r2, 0x1 @@ -354202,27 +354203,27 @@ sub_80C5484: ; 80C5484 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r5, [sp] str r4, [sp, 0x4] movs r0, 0x1 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r5, [sp] str r4, [sp, 0x4] movs r0, 0x2 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @080C56F4 @080C5624: ldr r4, =gUnknown_08DE07C8 @@ -354295,8 +354296,8 @@ sub_80C5484: ; 80C5484 b @080C56F4 .pool @080C56D0: - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably lsls r0, 24 lsrs r1, r0, 24 @@ -354396,16 +354397,16 @@ sub_80C570C: ; 80C570C @080C57AC: bl sub_80C50D0 bl clear_tasks - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator b @080C57E4 @080C57BE: movs r0, 0 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0x1 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0x2 - bl UnsetBgTileMap + bl UnsetBgTilemap bl sub_80C5340 ldr r0, =0x02039cec ldr r1, [r0] @@ -355130,7 +355131,7 @@ sub_80C5DB8: ; 80C5DB8 movs r4, 0 @080C5DC2: adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0 movs r1, 0 bl FillWindowPixelBuffer @@ -355231,7 +355232,7 @@ sub_80C5DB8: ; 80C5DB8 cmp r4, 0x4 bls @080C5E92 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0xC pop {r3} mov r8, r3 @@ -355294,7 +355295,7 @@ sub_80C5ED0: ; 80C5ED0 movs r1, 0x3 bl CopyWindowToVram movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0xC pop {r4} pop {r0} @@ -355338,7 +355339,7 @@ sub_80C5F58: ; 80C5F58 movs r0, 0x2 movs r2, 0x10 movs r3, 0x3 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette b @080C6004 .pool @080C5FA8: @@ -355352,7 +355353,7 @@ sub_80C5F58: ; 80C5F58 movs r1, 0 movs r2, 0x10 movs r3, 0x3 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect b @080C6004 @080C5FC2: cmp r2, 0 @@ -355370,7 +355371,7 @@ sub_80C5F58: ; 80C5F58 movs r0, 0x2 movs r2, 0x10 movs r3, 0xA - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette b @080C6004 .pool @080C5FEC: @@ -355384,10 +355385,10 @@ sub_80C5F58: ; 80C5F58 movs r1, 0 movs r2, 0x10 movs r3, 0xA - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect @080C6004: movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram cmp r7, 0 beq @080C6084 movs r4, 0xFE @@ -355538,7 +355539,7 @@ sub_80C6104: ; 80C6104 movs r0, 0x1 movs r2, 0x10 movs r3, 0x3 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette b @080C61CE .pool @080C614C: @@ -355578,7 +355579,7 @@ sub_80C6104: ; 80C6104 movs r2, 0x2 @080C6192: movs r3, 0xA - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette b @080C61CE .pool @080C61A4: @@ -355592,7 +355593,7 @@ sub_80C6104: ; 80C6104 movs r0, 0x1 movs r2, 0x15 movs r3, 0 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette b @080C61CE .pool @080C61C4: @@ -355629,7 +355630,7 @@ sub_80C6104: ; 80C6104 movs r0, 0x1 movs r2, 0x10 movs r3, 0x3 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette b @080C628E .pool @080C620C: @@ -355670,7 +355671,7 @@ sub_80C6104: ; 80C6104 movs r2, 0x2 @080C6254: movs r3, 0xA - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette b @080C628E .pool @080C6264: @@ -355684,7 +355685,7 @@ sub_80C6104: ; 80C6104 movs r0, 0x1 movs r2, 0x15 movs r3, 0 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette b @080C628E .pool @080C6284: @@ -355695,7 +355696,7 @@ sub_80C6104: ; 80C6104 bhi @080C6294 @080C628E: movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @080C6294: add sp, 0xC pop {r4,r5} @@ -355710,7 +355711,7 @@ sub_80C629C: ; 80C629C movs r0, 0x1 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer ldr r4, =0x02039cec ldr r1, [r4] ldrb r0, [r1, 0xC] @@ -355724,7 +355725,7 @@ sub_80C629C: ; 80C629C bl sub_80C5F58 bl sub_80C5DB8 movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram pop {r4} pop {r0} bx r0 @@ -355739,16 +355740,16 @@ sub_80C62DC: ; 80C62DC push {r6,r7} sub sp, 0x18 movs r5, 0 - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator bl rotscale_reset_all ldr r0, =gUnknown_085714E4 - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes ldr r4, =gUnknown_085714BC adds r0, r4, 0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic adds r4, 0x10 adds r0, r4, 0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085715B4 ldr r1, =0x02039cec ldr r2, [r1] @@ -355757,7 +355758,7 @@ sub_80C62DC: ; 80C62DC movs r6, 0xA ldrsh r2, [r2, r6] movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r3, =0x02039cf0 @@ -355812,7 +355813,7 @@ sub_80C62DC: ; 80C62DC lsls r3, r4, 24 lsrs r3, 24 mov r0, sp - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 mov r3, r9 @@ -355840,7 +355841,7 @@ sub_80C62DC: ; 80C62DC adds r0, r3 ldr r0, [r0] adds r1, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @080C63C2: lsls r0, r4, 24 lsrs r5, r0, 24 @@ -355863,7 +355864,7 @@ sub_80C63FC: ; 80C63FC ldr r4, =0x02039cf0 ldr r0, [r4] ldr r0, [r0] - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r4] str r5, [r0] adds r6, r4, 0 @@ -355875,7 +355876,7 @@ sub_80C63FC: ; 80C63FC ldr r0, [r0] cmp r0, 0 beq @080C642C - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r6] adds r0, 0x4 adds r0, r4 @@ -355887,11 +355888,11 @@ sub_80C63FC: ; 80C63FC lsrs r5, r0, 24 cmp r5, 0x6 bls @080C6410 - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator movs r0, 0x2 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag pop {r4-r6} pop {r0} bx r0 @@ -355989,8 +355990,8 @@ sub_80C64CC: ; 80C64CC bl sub_80C50D0 b @080C6694 @080C6526: - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator bl sub_80A1A74 bl reset_temp_tile_data_buffers b @080C6694 @@ -356005,17 +356006,17 @@ sub_80C64CC: ; 80C64CC ldr r1, [r4] adds r1, 0x12 movs r0, 0 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x00001012 adds r1, r0 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x00002012 adds r1, r0 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap movs r5, 0x1E str r5, [sp] movs r4, 0x14 @@ -356024,25 +356025,25 @@ sub_80C64CC: ; 80C64CC movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r5, [sp] str r4, [sp, 0x4] movs r0, 0x1 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r5, [sp] str r4, [sp, 0x4] movs r0, 0x2 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @080C6618 .pool @080C65C0: @@ -356078,10 +356079,10 @@ sub_80C64CC: ; 80C64CC movs r0, 0x2 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer @080C6618: movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @080C6694 .pool @080C6628: @@ -356202,41 +356203,41 @@ sub_80C66AC: ; 80C66AC ldr r0, [r0, 0x4] cmp r0, 0 beq @080C6746 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag @080C6746: ldr r0, [r4] ldr r0, [r0, 0xC] cmp r0, 0 beq @080C6758 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0x1 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag @080C6758: ldr r0, [r4] ldr r0, [r0, 0x8] cmp r0, 0 beq @080C676A - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0x4 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag @080C676A: bl FreeAllWindowBuffers b @080C67A4 .pool @080C6774: bl sub_80C50D0 - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator b @080C67A4 @080C6782: movs r0, 0 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0x1 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0x2 - bl UnsetBgTileMap + bl UnsetBgTilemap ldr r0, =0x02039cec ldr r1, [r0] movs r0, 0 @@ -356494,12 +356495,12 @@ sub_80C6974: ; 80C6974 push {r6,r7} sub sp, 0x18 movs r7, 0 - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator ldr r0, =gUnknown_085714E4 - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes ldr r6, =gUnknown_085714BC adds r0, r6, 0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085715B4 mov r8, r0 ldr r4, =0x02039cf4 @@ -356510,7 +356511,7 @@ sub_80C6974: ; 80C6974 mov r0, r8 movs r1, 0x9B movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r3, r0, 24 ldr r0, [r4] @@ -356537,10 +356538,10 @@ sub_80C6974: ; 80C6974 ldr r0, [r4] ldr r0, [r0, 0x4] movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim adds r6, 0x8 adds r0, r6, 0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic movs r3, 0x18 add r8, r3 ldr r6, =gUnknown_08571650 @@ -356554,7 +356555,7 @@ sub_80C6974: ; 80C6974 ldrsh r2, [r0, r3] mov r0, r8 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r3, r0, 24 ldr r1, [r4] @@ -356572,7 +356573,7 @@ sub_80C6974: ; 80C6974 lsls r1, 4 adds r1, r6 ldrb r1, [r1, 0xC] - bl obj_anim_image_start + bl StartObjectImageAnim bl sav1_map_get_name lsls r0, 24 lsrs r5, r0, 24 @@ -356668,7 +356669,7 @@ sub_80C6974: ; 80C6974 lsrs r4, r0, 16 @080C6AF2: ldr r0, =gUnknown_085714D4 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic mov r1, sp ldr r0, =gUnknown_085715FC ldm r0!, {r2,r3,r6} @@ -356702,7 +356703,7 @@ sub_80C6974: ; 80C6974 asrs r2, 16 mov r0, sp movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r3, r0, 24 ldr r4, =0x02039cf4 @@ -356726,7 +356727,7 @@ sub_80C6974: ; 80C6974 ldr r0, [r4] ldr r0, [r0, 0x8] movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim @080C6B7A: add sp, 0x18 pop {r3,r4} @@ -356745,7 +356746,7 @@ sub_80C6B94: ; 80C6B94 movs r4, 0 @080C6B9A: adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0 movs r1, 0 bl FillWindowPixelBuffer @@ -356829,7 +356830,7 @@ sub_80C6B94: ; 80C6B94 cmp r4, 0x2 bls @080C6C40 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0xC pop {r4-r6} pop {r0} @@ -356909,7 +356910,7 @@ sub_80C6C70: ; 80C6C70 lsls r1, 4 adds r1, r4 ldrb r1, [r1, 0xC] - bl obj_anim_image_start + bl StartObjectImageAnim ldr r1, [r5] ldr r2, [r1, 0xC] ldrb r0, [r1, 0x10] @@ -356953,7 +356954,7 @@ sub_80C6C70: ; 80C6C70 cmp r4, 0x2 bls @080C6D4A movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x6C bl audio_play add sp, 0xC @@ -358319,10 +358320,10 @@ sub_80C77E8: ; 80C77E8 cmp r0, 0 beq @080C7846 adds r0, r4, 0 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette @080C7846: mov r0, sp - bl gpu_tile_obj_alloc_and_load_multiple + bl LoadObjectPics ldr r0, =0x02039d04 str r5, [r0] movs r1, 0x90 @@ -358364,21 +358365,21 @@ sub_80C7890: ; 80C7890 adds r2, 0x6 adds r0, r1, r2 ldrh r0, [r0] - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag @080C78AC: ldr r0, [r5] movs r4, 0x90 lsls r4, 2 adds r0, r4 ldrh r0, [r0] - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag ldr r0, [r5] adds r0, r4 ldrh r0, [r0] adds r0, 0x1 lsls r0, 16 lsrs r0, 16 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag pop {r4,r5} pop {r0} bx r0 @@ -358518,7 +358519,7 @@ sub_80C7958: ; 80C7958 movs r1, 0xA0 movs r2, 0x60 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 ldr r3, [r6] @@ -358556,7 +358557,7 @@ sub_80C7958: ; 80C7958 add r0, sp, 0x4 movs r1, 0x7C movs r2, 0x50 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 ldr r2, [r6] @@ -358603,7 +358604,7 @@ sub_80C7958: ; 80C7958 ldr r0, [r0] lsls r1, r5, 24 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -358670,7 +358671,7 @@ sub_80C7B14: ; 80C7B14 ldr r0, [r0] cmp r0, 0 beq @080C7B2A - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, [r4] movs r0, 0 str r0, [r1] @@ -358685,7 +358686,7 @@ sub_80C7B14: ; 80C7B14 ldr r0, [r0] cmp r0, 0 beq @080C7B4A - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r6] adds r0, 0x4 adds r0, r4 @@ -358707,7 +358708,7 @@ sub_80C7B14: ; 80C7B14 ldr r0, [r0] cmp r0, 0 beq @080C7B6A - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @080C7B6A: adds r0, r5, 0x1 lsls r0, 16 @@ -358867,7 +358868,7 @@ sub_80C7BE4: ; 80C7BE4 lsls r1, 2 adds r0, r1 ldrh r0, [r0] - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag adds r1, r0, 0 lsls r1, 16 lsrs r1, 11 @@ -358923,8 +358924,8 @@ sub_80C7CF4: ; 80C7CF4 thumb_func_start sub_80C7D28 sub_80C7D28: ; 80C7D28 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl sub_80D2AA4 bl copy_pal_bg_faded_to_pal_ram ldr r0, =0x02039d08 @@ -358947,8 +358948,8 @@ c2_Box: ; 80C7D54 bl do_scheduled_bg_tilemap_copies_to_vram bl sub_80CA028 bl sub_80CAA14 - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad pop {r0} bx r0 thumb_func_end c2_Box @@ -359073,9 +359074,9 @@ sub_80C7E98: ; 80C7E98 push {r4,lr} sub sp, 0x4 bl sub_80A1A74 - bl reset_all_obj_data - bl gpu_tile_obj_tags_reset - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl FreeAllObjectTiles + bl ResetObjectPaletteAllocator bl ClearDma3Requests ldr r1, =0x02021b3a movs r2, 0xA0 @@ -359263,9 +359264,9 @@ task_box_related_3: ; 80C7FA8 b @080C80D0 @080C805E: movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x1 - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0 str r0, [sp] movs r1, 0xC0 @@ -362798,7 +362799,7 @@ sub_80CA044: ; 80CA044 ldr r1, [r5] adds r1, r4 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap movs r0, 0x1 bl ShowBg movs r0, 0x1 @@ -362833,7 +362834,7 @@ sub_80CA0A4: ; 80CA0A4 sub_80CA0C8: ; 80CA0C8 push {lr} ldr r0, =gUnknown_08572744 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette pop {r0} bx r0 .pool @@ -362917,7 +362918,7 @@ sub_80CA154: ; 80CA154 movs r0, 0x96 strh r0, [r1, 0x22] movs r0, 0x10 - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag ldr r1, [r4] movs r2, 0xDA lsls r2, 4 @@ -362943,7 +362944,7 @@ sub_80CA1C4: ; 80CA1C4 str r0, [sp] str r1, [sp, 0x4] mov r0, sp - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic movs r4, 0 @080CA1DA: lsls r1, r4, 6 @@ -362954,7 +362955,7 @@ sub_80CA1C4: ; 80CA1C4 ldr r0, =gUnknown_085728BC movs r2, 0x9 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r1, =0x02039d08 @@ -363165,13 +363166,13 @@ sub_80CA318: ; 80CA318 movs r1, 0 str r1, [r0] adds r0, r3, 0 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 beq @080CA420 adds r0, r7, 0 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xFF @@ -363210,7 +363211,7 @@ sub_80CA318: ; 80CA318 movs r1, 0x28 movs r2, 0x30 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -363225,9 +363226,9 @@ sub_80CA318: ; 80CA318 cmp r0, 0 bne @080CA43C movs r0, 0x2 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag ldr r0, =0x0000dac6 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag @080CA43C: add sp, 0x28 pop {r4-r7} @@ -363261,7 +363262,7 @@ sub_80CA44C: ; 80CA44C movs r2, 0x1 str r2, [sp] adds r2, r4, 0 - bl sub_8034654 + bl DecompressMonPic ldr r1, [r6] ldr r2, =0x00000cdc adds r0, r1, r2 @@ -363489,7 +363490,7 @@ sub_80CA65C: ; 80CA65C adds r1, 0x1 lsls r1, 24 lsrs r1, 24 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -363516,7 +363517,7 @@ sub_80CA65C: ; 80CA65C ldr r0, [r0] lsls r1, r4, 25 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -363766,7 +363767,7 @@ sub_80CA8C8: ; 80CA8C8 movs r0, 0x1 str r0, [sp, 0x4] movs r2, 0xA - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0x8 negs r0, r0 bl sub_80CBAF0 @@ -364162,9 +364163,9 @@ sub_80CAC1C: ; 80CAC1C movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0xC pop {r0} bx r0 @@ -364287,7 +364288,7 @@ sub_80CAC58: ; 80CAC58 movs r2, 0xE bl sub_8098858 movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x1 movs r1, 0x2 bl CopyWindowToVram @@ -366940,7 +366941,7 @@ sub_80CC230: ; 80CC230 asrs r2, 16 mov r0, sp mov r3, r9 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -366993,7 +366994,7 @@ sub_80CC314: ; 80CC314 ldrh r0, [r4, 0x2E] bl sub_80CC1E0 adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles pop {r4} pop {r0} bx r0 @@ -367098,7 +367099,7 @@ sub_80CC370: ; 80CC370 ldr r2, =0x00004ac4 adds r1, r2 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap movs r0, 0x2 bl ShowBg b @080CC458 @@ -367760,7 +367761,7 @@ sub_80CC7A0: ; 80CC7A0 bl LoadBgTiles @080CC9DA: movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0x8 pop {r4-r7} pop {r0} @@ -367847,7 +367848,7 @@ sub_80CCA3C: ; 80CCA3C adds r1, r5, 0 movs r2, 0 movs r3, 0 - bl CopyRectToBgTileMapBufferRect + bl CopyRectToBgTilemapBufferRect cmp r7, 0 beq @080CCAD2 cmp r7, 0 @@ -367875,7 +367876,7 @@ sub_80CCA3C: ; 80CCA3C movs r0, 0x2 movs r1, 0 movs r3, 0x2 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect @080CCAD2: add sp, 0x24 pop {r4-r7} @@ -368004,7 +368005,7 @@ sub_80CCB50: ; 80CCB50 adds r4, r1 strh r0, [r4] add r0, sp, 0x4 - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes mov r2, r10 ldr r0, [r2] movs r6, 0xE7 @@ -368014,7 +368015,7 @@ sub_80CCB50: ; 80CCB50 lsls r1, 2 str r1, [r0] adds r0, r7, 0 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 24 mov r4, r10 @@ -368036,7 +368037,7 @@ sub_80CCB50: ; 80CCB50 orrs r0, r1 str r0, [r3] adds r0, r7, 0 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 24 mov r1, r10 @@ -368073,7 +368074,7 @@ sub_80CCB50: ; 80CCB50 movs r3, 0 bl sub_80C6D80 ldr r0, [sp, 0x2C] - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic mov r0, r8 bl sav3_get_box_name bl sub_80CD00C @@ -368088,7 +368089,7 @@ sub_80CCB50: ; 80CCB50 ldr r0, =gUnknown_0857B0A8 movs r2, 0x1C movs r3, 0x18 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -368107,7 +368108,7 @@ sub_80CCB50: ; 80CCB50 str r0, [r2] lsls r1, r4, 24 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -368239,7 +368240,7 @@ sub_80CCCFC: ; 80CCCFC movs r3, 0 bl sub_80C6D80 adds r0, r6, 0 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, [sp, 0x28] bl sub_80D20F8 lsls r0, 24 @@ -368281,7 +368282,7 @@ sub_80CCCFC: ; 80CCCFC add r0, sp, 0x4 movs r2, 0x1C movs r3, 0x18 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 mov r1, r9 @@ -368316,7 +368317,7 @@ sub_80CCCFC: ; 80CCCFC str r1, [r0, 0x1C] lsls r1, r7, 24 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim mov r1, r9 ldr r0, [r1] movs r3, 0xE4 @@ -368359,12 +368360,12 @@ sub_80CCEE0: ; 80CCEE0 cmp r0, 0 bne @080CCF00 movs r0, 0x4 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag b @080CCF06 .pool @080CCF00: movs r0, 0x3 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag @080CCF06: ldr r0, =0x02039d08 ldr r0, [r0] @@ -368443,7 +368444,7 @@ sub_80CCF64: ; 80CCF64 cmp r0, 0xC0 bls @080CCF96 adds r0, r2, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @080CCF96: pop {r0} bx r0 @@ -368520,7 +368521,7 @@ sub_80CD00C: ; 80CD00C sub_80CD02C: ; 80CD02C push {r4,r5,lr} ldr r0, =gUnknown_0857B080 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic movs r5, 0 @080CD036: lsls r1, r5, 4 @@ -368533,7 +368534,7 @@ sub_80CD02C: ; 80CD02C ldr r0, =gUnknown_0857B0E0 movs r2, 0x1C movs r3, 0x16 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -368546,7 +368547,7 @@ sub_80CD02C: ; 80CD02C lsls r1, r5, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0x1 cmp r5, 0 bne @080CD076 @@ -368895,7 +368896,7 @@ sub_80CD2E8: ; 80CD2E8 adds r1, r5, 0 adds r2, r6, 0 adds r3, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -368908,7 +368909,7 @@ sub_80CD2E8: ; 80CD2E8 ldr r5, =0x02020630 adds r6, r4, r5 adds r0, r6, 0 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0x3 mov r1, r8 ands r1, r0 @@ -369569,7 +369570,7 @@ sub_80CD894: ; 80CD894 adds r0, r1, r2 ldr r0, [r0] movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim b @080CD8FC .pool @080CD8E4: @@ -369582,7 +369583,7 @@ sub_80CD894: ; 80CD894 adds r0, r1 ldr r0, [r0] movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim @080CD8FC: ldr r0, =0x02039d08 ldr r0, [r0] @@ -369770,7 +369771,7 @@ sub_80CDA68: ; 80CDA68 adds r0, r2, r3 ldr r0, [r0] movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim b @080CDAD8 .pool @080CDAC0: @@ -369783,7 +369784,7 @@ sub_80CDA68: ; 80CDA68 adds r0, r1 ldr r0, [r0] movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @080CDAD8: bl sub_80CEB40 ldr r0, =0x02039d78 @@ -370061,7 +370062,7 @@ sub_80CDCCC: ; 80CDCCC adds r0, r1, r2 ldr r0, [r0] movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim b @080CDD4A .pool @080CDD1C: @@ -370074,7 +370075,7 @@ sub_80CDCCC: ; 80CDCCC adds r0, r1 ldr r0, [r0] movs r1, 0x3 - bl obj_anim_image_start + bl StartObjectImageAnim bl sub_80CDF38 b @080CDD4A .pool @@ -370128,7 +370129,7 @@ sub_80CDD5C: ; 80CDD5C adds r0, r1 ldr r0, [r0] movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim bl sub_80CDFAC b @080CDDBC .pool @@ -370142,7 +370143,7 @@ sub_80CDD5C: ; 80CDD5C adds r0, r1 ldr r0, [r0] movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @080CDDBC: ldr r1, [r4] adds r1, r5 @@ -370210,7 +370211,7 @@ sub_80CDDD8: ; 80CDDD8 adds r0, r1 ldr r0, [r0] movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, [r4] ldr r2, =0x00000d91 adds r0, r2 @@ -370234,7 +370235,7 @@ sub_80CDDD8: ; 80CDDD8 adds r0, r1 ldr r0, [r0] movs r1, 0x3 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, [r4] ldr r2, =0x00000d91 adds r0, r2 @@ -370654,7 +370655,7 @@ sub_80CE19C: ; 80CE19C adds r0, r1 ldr r0, [r0] movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0x1 @080CE21A: pop {r4-r6} @@ -370672,7 +370673,7 @@ sub_80CE22C: ; 80CE22C adds r0, r1 ldr r0, [r0] movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim bl sub_80CEB40 pop {r0} bx r0 @@ -370731,7 +370732,7 @@ sub_80CE2A8: ; 80CE2A8 adds r0, r1 ldr r0, [r0] movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0 @080CE2CA: pop {r1} @@ -370790,7 +370791,7 @@ sub_80CE324: ; 80CE324 adds r0, r1 ldr r0, [r0] movs r1, 0x3 - bl obj_anim_image_start + bl StartObjectImageAnim @080CE33E: pop {r0} bx r0 @@ -373692,18 +373693,18 @@ sub_80CFC14: ; 80CFC14 ldr r0, [r0] str r0, [r1] mov r0, sp - bl gpu_tile_obj_alloc_and_load_multiple + bl LoadObjectPics adds r0, r4, 0 - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes ldr r0, =0x0000daca - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag ldr r6, =0x02039d08 ldr r1, [r6] ldr r4, =0x00000cd8 adds r1, r4 strb r0, [r1] ldr r0, =0x0000dac7 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag ldr r1, [r6] ldr r5, =0x00000cd9 adds r1, r5 @@ -373724,7 +373725,7 @@ sub_80CFC14: ; 80CFC14 movs r3, 0 ldrsh r2, [r5, r3] movs r3, 0x6 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -373768,7 +373769,7 @@ sub_80CFC14: ; 80CFC14 adds r0, r4 ldr r0, [r0] movs r1, 0x3 - bl obj_anim_image_start + bl StartObjectImageAnim b @080CFD22 .pool @080CFD18: @@ -373795,7 +373796,7 @@ sub_80CFC14: ; 80CFC14 ldr r0, =gUnknown_0857BA68 movs r1, 0 movs r2, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -373933,7 +373934,7 @@ sub_80CFE54: ; 80CFE54 ldr r2, =0x00000cb4 adds r0, r2 ldr r0, [r0] - bl obj_anim_image_start + bl StartObjectImageAnim pop {r0} bx r0 .pool @@ -374159,7 +374160,7 @@ sub_80CFFD0: ; 80CFFD0 strh r0, [r1] lsls r0, 24 lsrs r0, 24 - bl ClearWindowTileMap + bl ClearWindowTilemap ldr r0, [r5] adds r0, r4 ldrb r0, [r0] @@ -374458,7 +374459,7 @@ sub_80D024C: ; 80D024C movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 ldr r5, =0x02039d08 ldr r0, [r5] movs r4, 0x88 @@ -374478,7 +374479,7 @@ sub_80D024C: ; 80D024C ldr r0, [r5] adds r0, r4 ldrb r0, [r0] - bl PutWindowTileMap + bl PutWindowTilemap ldr r0, [r5] adds r0, r4 ldrb r0, [r0] @@ -375628,9 +375629,9 @@ sub_80D0B5C: ; 80D0B5C movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0x8 pop {r0} bx r0 @@ -375781,10 +375782,10 @@ sub_80D0C60: ; 80D0C60 orrs r0, r1 str r0, [r2, 0x4] mov r0, r9 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic mov r4, r9 ldrh r0, [r4, 0x6] - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag mov r5, r8 ldr r1, [r5] lsls r5, r7, 4 @@ -375800,7 +375801,7 @@ sub_80D0C60: ; 80D0C60 adds r4, r7, r0 lsls r0, r4, 16 lsrs r0, 16 - bl gpu_pal_alloc_new + bl AllocObjectPalette mov r2, r8 ldr r1, [r2] adds r1, r5 @@ -375821,7 +375822,7 @@ sub_80D0C60: ; 80D0C60 movs r1, 0 movs r2, 0 movs r3, 0xB - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 mov r4, r8 @@ -377213,7 +377214,7 @@ sub_80D184C: ; 80D184C str r0, [sp, 0xC] movs r0, 0 movs r3, 0xD - bl WriteSequenceToBgTileMapBuffer + bl WriteSequenceToBgTilemapBuffer adds r4, 0x1 cmp r4, r5 blt @080D187C @@ -377263,7 +377264,7 @@ sub_80D18E4: ; 80D18E4 movs r1, 0 movs r2, 0x15 movs r3, 0xC - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect @080D1920: ldr r1, [r5] adds r1, r4 @@ -377303,7 +377304,7 @@ sub_80D18E4: ; 80D18E4 str r0, [sp, 0xC] movs r0, 0 movs r3, 0xD - bl WriteSequenceToBgTileMapBuffer + bl WriteSequenceToBgTilemapBuffer adds r4, 0x1 cmp r4, r5 blt @080D1936 @@ -377325,7 +377326,7 @@ sub_80D18E4: ; 80D18E4 movs r0, 0 movs r1, 0 movs r3, 0xC - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r0, 0 bl schedule_bg_copy_tilemap_to_vram movs r0, 0x1 @@ -377356,7 +377357,7 @@ sub_80D19B4: ; 80D19B4 movs r0, 0 movs r2, 0 movs r3, 0xC - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x0000093a str r4, [sp] str r6, [sp, 0x4] @@ -377364,7 +377365,7 @@ sub_80D19B4: ; 80D19B4 movs r0, 0 movs r2, 0 movs r3, 0x14 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect @080D19EC: ldr r1, =0x0000013b lsls r5, r7, 24 @@ -377378,7 +377379,7 @@ sub_80D19B4: ; 80D19B4 movs r0, 0 adds r2, r5, 0 movs r3, 0xD - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r1, 0x9E lsls r1, 1 str r4, [sp] @@ -377387,7 +377388,7 @@ sub_80D19B4: ; 80D19B4 movs r0, 0 adds r2, r5, 0 movs r3, 0xC - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x0000013d str r4, [sp] str r4, [sp, 0x4] @@ -377395,7 +377396,7 @@ sub_80D19B4: ; 80D19B4 movs r0, 0 adds r2, r5, 0 movs r3, 0x14 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r0, 0 bl schedule_bg_copy_tilemap_to_vram add sp, 0xC @@ -379503,7 +379504,7 @@ sub_80D2960: ; 80D2960 movs r1, 0x1 str r1, [sp, 0x4] adds r1, r7, 0 - bl CopyToBgTileMapBufferRect + bl CopyToBgTilemapBufferRect add r7, r9 adds r6, 0x1 mov r1, r10 @@ -379583,7 +379584,7 @@ sub_80D29F8: ; 80D29F8 movs r1, 0x1 str r1, [sp, 0x4] adds r1, r7, 0 - bl CopyToBgTileMapBufferRect + bl CopyToBgTilemapBufferRect add r7, r9 adds r6, 0x1 mov r1, r10 @@ -380200,7 +380201,7 @@ sub_80D2F04: ; 80D2F04 @080D2F0A: lsls r0, r4, 3 adds r0, r5 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -380231,13 +380232,13 @@ sub_80D2F28: ; 80D2F28 lsls r0, 3 adds r4, r0, r1 ldrh r0, [r4, 0x4] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF bne @080D2F5A adds r0, r4, 0 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette @080D2F5A: pop {r4} pop {r0} @@ -380257,13 +380258,13 @@ sub_80D2F68: ; 80D2F68 lsls r0, 3 adds r4, r0, r1 ldrh r0, [r4, 0x4] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF bne @080D2F8E adds r0, r4, 0 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette @080D2F8E: pop {r4} pop {r0} @@ -380280,7 +380281,7 @@ sub_80D2F9C: ; 80D2F9C lsls r0, r4, 3 adds r0, r5 ldrh r0, [r0, 0x4] - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -380311,7 +380312,7 @@ sub_80D2FC0: ; 80D2FC0 lsls r0, 3 adds r0, r1 ldrh r0, [r0, 0x4] - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag pop {r0} bx r0 .pool @@ -380329,7 +380330,7 @@ sub_80D2FF0: ; 80D2FF0 lsls r0, 3 adds r0, r1 ldrh r0, [r0, 0x4] - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag pop {r0} bx r0 .pool @@ -380515,7 +380516,7 @@ sub_80D30DC: ; 80D30DC lsrs r1, 17 ldr r3, =0x06010000 adds r1, r3 - bl copy_queue_add + bl AddTilesToObjectCopyRequests mov r0, r8 ldrb r1, [r0] ldr r0, [r4, 0x8] @@ -380630,7 +380631,7 @@ sub_80D31B4: ; 80D31B4 adds r1, r4, 0 adds r2, r5, 0 mov r3, r8 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r6, =0x02020630 @@ -380688,7 +380689,7 @@ sub_80D328C: ; 80D328C str r1, [sp, 0x4] mov r1, sp str r1, [r0, 0xC] - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles add sp, 0x8 pop {r0} bx r0 @@ -381837,7 +381838,7 @@ sub_80D3B00: ; 80D3B00 adds r2, 0x14 ldr r0, =gUnknown_0857C66C movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r4] adds r1, r6 strb r0, [r1] @@ -382576,7 +382577,7 @@ sub_80D41D0: ; 80D41D0 lsls r0, 2 ldr r5, =0x02020630 adds r0, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -383705,7 +383706,7 @@ sub_80D4A78: ; 80D4A78 adds r0, r7, 0 mov r6, r8 lsrs r3, r6, 24 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect adds r4, 0x1 adds r5, 0x1 cmp r5, 0xB @@ -383725,7 +383726,7 @@ sub_80D4A78: ; 80D4A78 adds r0, r7, 0 mov r2, r8 ldr r3, [sp, 0xC] - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x0000022a ldr r6, [sp, 0x10] add r6, r10 @@ -383738,7 +383739,7 @@ sub_80D4A78: ; 80D4A78 adds r0, r7, 0 adds r2, r6, 0 ldr r3, [sp, 0xC] - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x0000022b ldr r4, [sp, 0xC] adds r4, 0x1 @@ -383751,7 +383752,7 @@ sub_80D4A78: ; 80D4A78 adds r0, r7, 0 mov r2, r8 adds r3, r4, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r1, 0x8B lsls r1, 2 str r5, [sp] @@ -383761,7 +383762,7 @@ sub_80D4A78: ; 80D4A78 adds r0, r7, 0 adds r2, r6, 0 adds r3, r4, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x0000022d ldr r4, [sp, 0xC] adds r4, 0x2 @@ -383774,7 +383775,7 @@ sub_80D4A78: ; 80D4A78 adds r0, r7, 0 mov r2, r8 adds r3, r4, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x0000022e str r5, [sp] str r5, [sp, 0x4] @@ -383783,7 +383784,7 @@ sub_80D4A78: ; 80D4A78 adds r0, r7, 0 adds r2, r6, 0 adds r3, r4, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r5, 0 ldr r1, [sp, 0xC] ldr r2, [sp, 0x14] @@ -383807,7 +383808,7 @@ sub_80D4A78: ; 80D4A78 str r0, [sp, 0x8] adds r0, r7, 0 lsrs r3, r4, 24 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect adds r5, 0x1 cmp r5, 0xB ble @080D4B8A @@ -383865,7 +383866,7 @@ sub_80D4BE0: ; 80D4BE0 adds r0, r5, 0 bl CallWindowFunction adds r0, r5, 0 - bl PutWindowTileMap + bl PutWindowTilemap ldr r0, =0x02037318 ldrb r0, [r0, 0x16] cmp r0, 0xE @@ -383919,9 +383920,9 @@ sub_80D4CA8: ; 80D4CA8 beq @080D4CEE adds r4, 0x64 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag ldrb r1, [r5] lsls r0, r1, 4 adds r0, r1 @@ -383934,7 +383935,7 @@ sub_80D4CA8: ; 80D4CA8 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0xFF strb r0, [r5] @080D4CEE: @@ -383958,7 +383959,7 @@ sub_80D4D00: ; 80D4D00 movs r1, 0x44 movs r2, 0x42 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront strb r0, [r4] adds r0, r5, 0 movs r1, 0 @@ -383995,7 +383996,7 @@ sub_80D4D38: ; 80D4D38 strh r0, [r2, 0x2E] adds r0, r2, 0 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim b @080D4D90 .pool @080D4D84: @@ -384003,7 +384004,7 @@ sub_80D4D38: ; 80D4D38 lsls r1, 24 lsrs r1, 24 adds r0, r2, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @080D4D90: pop {r0} bx r0 @@ -384026,7 +384027,7 @@ sub_80D4D94: ; 80D4D94 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =DummyObjectCallback str r0, [r4, 0x1C] @080D4DB8: @@ -384101,14 +384102,14 @@ sub_80D4E34: ; 80D4E34 ldr r0, =0x00000805 adds r4, r0 ldr r0, =gUnknown_0857FBA0 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, =gUnknown_0857FBA8 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette ldr r0, =gUnknown_0857FBB0 movs r1, 0x10 movs r2, 0x10 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront strb r0, [r4] ldr r2, =0x02020630 ldrb r1, [r4] @@ -384230,9 +384231,9 @@ sub_80D4F38: ; 80D4F38 bne @080D4F86 adds r4, 0x66 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag adds r0, r4, 0 adds r1, r4, 0 adds r2, r6, 0 @@ -384397,12 +384398,12 @@ sub_80D5070: ; 80D5070 orrs r0, r1 str r0, [sp, 0x4] mov r0, sp - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette adds r4, r5 ldr r0, [r4] ldr r4, =0x0201d000 adds r1, r4, 0 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r0, =0xfffff000 adds r1, r4, r0 adds r0, r4, 0 @@ -384434,7 +384435,7 @@ sub_80D50D4: ; 80D50D4 adds r1, r4, 0 adds r2, r5, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 pop {r4,r5} @@ -384447,7 +384448,7 @@ sub_80D50D4: ; 80D50D4 sub_80D510C: ; 80D510C push {lr} ldr r0, =0x00007544 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag pop {r0} bx r0 .pool @@ -384473,14 +384474,14 @@ sub_80D511C: ; 80D511C lsrs r0, 24 mov r8, r0 ldr r0, =0x00007544 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag adds r0, r4, 0 bl sub_80D5070 ldr r0, =gUnknown_0857FC7C adds r1, r5, 0 adds r2, r6, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 adds r4, r1, 0 @@ -384513,7 +384514,7 @@ sub_80D518C: ; 80D518C asrs r1, 16 movs r2, 0x74 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 pop {r1} @@ -389323,17 +389324,17 @@ sub_80D7724: ; 80D7724 ldr r0, =gUnknown_08C17AB0 movs r1, 0xC0 lsls r1, 19 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08C1850C ldr r1, =0x06002000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r1, =gUnknown_08C16FA8 movs r0, 0x3 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, =gUnknown_08C16E90 movs r2, 0x80 lsls r2, 2 @@ -389385,7 +389386,7 @@ sub_80D779C: ; 80D779C adds r1, 0x24 adds r1, r2 ldr r1, [r1] - bl SetBgTileMap + bl SetBgTilemap adds r4, 0x1 cmp r4, 0x3 ble @080D77BA @@ -389811,9 +389812,9 @@ sub_80D7B24: ; 80D7B24 movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x8] - bl reset_all_obj_data + bl ResetAllObjectData bl clear_tasks - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator ldr r1, =0x0300301c movs r0, 0x4 strb r0, [r1] @@ -390161,14 +390162,14 @@ sub_80D7E44: ; 80D7E44 ldr r0, =gUnknown_08C17AB0 movs r1, 0xC0 lsls r1, 19 - bl call_LZZUnCompVram + bl LZDecompressVram b @080D80AE .pool @080D7ED8: ldr r0, =gUnknown_08C1850C ldr r4, =0x06002000 adds r1, r4, 0 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r3, =0x02018000 movs r5, 0x80 lsls r5, 6 @@ -390201,9 +390202,9 @@ sub_80D7E44: ; 80D7E44 movs r0, 0x3 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @080D80AE .pool @080D7F40: @@ -390211,9 +390212,9 @@ sub_80D7E44: ; 80D7E44 movs r0, 0x2 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0x2C] @@ -390310,11 +390311,11 @@ sub_80D7E44: ; 80D7E44 strb r0, [r1] bl sub_80DEA20 movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x3 bl ShowBg movs r0, 0x2 @@ -390526,9 +390527,9 @@ sub_80D8108: ; 80D8108 thumb_func_start sub_80D823C sub_80D823C: ; 80D823C push {r4,r5,lr} - bl call_obj_callbacks + bl CallObjectCallbacks bl run_active_tasks - bl obj_sync_something + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably movs r4, 0 @080D8250: @@ -390541,7 +390542,7 @@ sub_80D823C: ; 80D823C beq @080D8266 lsls r0, r4, 24 lsrs r0, 24 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @080D8266: adds r4, 0x1 cmp r4, 0x3 @@ -390606,8 +390607,8 @@ vblank_cb_battle: ; 80D827C movs r0, 0x46 bl SetGpuReg bl copy_pal_bg_faded_to_pal_ram - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl sub_80BA0A8 pop {r0} bx r0 @@ -391298,7 +391299,7 @@ sub_80D895C: ; 80D895C movs r1, 0 bl FillWindowPixelBuffer adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0 movs r1, 0x2 bl CopyWindowToVram @@ -393847,7 +393848,7 @@ sub_80D8B38: ; 80D8B38 adds r0, r6, 0 bl obj_free_rotscale_entry adds r0, r6, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0x14 strh r0, [r4, 0x8] b @080DA100 @@ -395892,7 +395893,7 @@ sub_80DB09C: ; 80DB09C sub_80DB0C4: ; 80DB0C4 push {r4,r5,lr} ldr r0, =gUnknown_08587C00 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_08C1C6B8 movs r1, 0x88 lsls r1, 1 @@ -395902,7 +395903,7 @@ sub_80DB0C4: ; 80DB0C4 movs r1, 0x70 movs r2, 0x24 movs r3, 0x1E - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r4, =0x02020630 @@ -395930,14 +395931,14 @@ sub_80DB0C4: ; 80DB0C4 sub_80DB120: ; 80DB120 push {lr} ldr r0, =gUnknown_08587C08 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_08587C10 - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette ldr r0, =gUnknown_08587C18 movs r1, 0x60 movs r2, 0xA movs r3, 0x1D - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r1, =0x02020630 @@ -395987,7 +395988,7 @@ sub_80DB174: ; 80DB174 ldr r1, [r1, 0x4] adds r2, r5, 0 adds r3, r6, 0 - bl help_system_enable_unless_flashback__sp199 + bl DecompressMonPic_DetectFrontOrBack_2 b @080DB1CC .pool @080DB1B8: @@ -395999,7 +396000,7 @@ sub_80DB174: ; 80DB174 ldr r1, [r1, 0x4] adds r2, r5, 0 adds r3, r6, 0 - bl sub_8034B50 + bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack @080DB1CC: adds r0, r5, 0 adds r1, r7, 0 @@ -396023,7 +396024,7 @@ sub_80DB174: ; 80DB174 adds r0, r4, 0 movs r1, 0x70 movs r3, 0x1E - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 ldr r0, =0x02020630 @@ -398178,7 +398179,7 @@ sub_80DC0F4: ; 80DC0F4 sub_80DC2BC: ; 80DC2BC push {r4,r5,lr} ldr r0, =gUnknown_08587A74 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic movs r4, 0 ldr r5, =gUnknown_08587A6C @080DC2C8: @@ -398190,7 +398191,7 @@ sub_80DC2BC: ; 80DC2BC ldr r0, =gUnknown_08587AD0 movs r1, 0xB4 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, =0x02039f34 ldr r1, [r1] ldr r2, [r1, 0x14] @@ -398470,7 +398471,7 @@ sub_80DC4F0: ; 80DC4F0 mov r7, r8 push {r7} ldr r0, =gUnknown_08587B08 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette movs r5, 0 ldr r7, =0x02039f34 ldr r0, =0x02020630 @@ -398480,7 +398481,7 @@ sub_80DC4F0: ; 80DC4F0 lsls r0, r5, 3 ldr r1, =gUnknown_08587AE8 adds r0, r1 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_08587B18 adds r0, r6, r0 ldr r2, =gUnknown_08587A70 @@ -398491,7 +398492,7 @@ sub_80DC4F0: ; 80DC4F0 ldrb r2, [r1] movs r1, 0xCC movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] ldr r1, [r1, 0x14] lsls r4, r5, 2 @@ -398506,7 +398507,7 @@ sub_80DC4F0: ; 80DC4F0 lsls r0, 2 add r0, r8 ldr r1, =gUnknown_08587B80 - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable ldr r0, [r7] ldr r0, [r0, 0x14] adds r4, r0 @@ -398536,14 +398537,14 @@ sub_80DC4F0: ; 80DC4F0 sub_80DC594: ; 80DC594 push {lr} ldr r0, =gUnknown_08587BB0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_08587BB8 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette ldr r0, =gUnknown_08587BC8 movs r1, 0x1E movs r2, 0x2C movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r2, =0x02020630 @@ -399109,11 +399110,11 @@ sub_80DC9EC: ; 80DC9EC lsls r4, r1, 3 ldr r0, =gUnknown_08589904 adds r0, r4, r0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_08589924 adds r4, r0 adds r0, r4, 0 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette ldr r2, [sp, 0xC] lsls r4, r2, 1 adds r4, r2 @@ -399124,7 +399125,7 @@ sub_80DC9EC: ; 80DC9EC movs r1, 0xB8 adds r2, r5, 0 movs r3, 0x1D - bl obj_add_from_template_forward_search + bl AddObjectToFront mov r9, r0 mov r3, r9 lsls r3, 24 @@ -399134,7 +399135,7 @@ sub_80DC9EC: ; 80DC9EC movs r1, 0xF8 adds r2, r5, 0 movs r3, 0x1D - bl obj_add_from_template_forward_search + bl AddObjectToFront mov r8, r0 mov r0, r8 lsls r0, 24 @@ -399272,9 +399273,9 @@ sub_80DCB78: ; 80DCB78 adds r0, r4, 0 bl obj_free_rotscale_entry adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r5, 0 - bl obj_delete_and_free_resources + bl RemoveObjectAndFreeResources pop {r4,r5} pop {r0} bx r0 @@ -401075,7 +401076,7 @@ sub_80DDA20: ; 80DDA20 movs r0, 0x1 strh r0, [r4, 0xA] ldr r0, =0x0000abe2 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0xC] @@ -402146,7 +402147,7 @@ sub_80DE224: ; 80DE224 movs r0, 0x1 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer movs r0, 0x1 bl sub_80DED60 movs r5, 0 @@ -402659,7 +402660,7 @@ sub_80DE69C: ; 80DE69C adds r0, r1 lsls r0, 2 adds r0, r6 - bl obj_anim_step + bl AnimateObject ldr r0, [r5] ldr r0, [r0, 0x14] adds r0, r4, r0 @@ -403199,7 +403200,7 @@ sub_80DEB70: ; 80DEB70 lsls r4, 24 lsrs r4, 24 adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 bl sub_80DED60 add sp, 0x10 @@ -403247,7 +403248,7 @@ sub_80DEBD0: ; 80DEBD0 lsls r5, 24 lsrs r5, 24 adds r0, r5, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 bl sub_80DED60 add sp, 0x10 @@ -403317,7 +403318,7 @@ sub_80DEC30: ; 80DEC30 bl AddTextPrinter @080DECA4: movs r0, 0x4 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 bl sub_80DED60 add sp, 0x10 @@ -403360,7 +403361,7 @@ sub_80DECB8: ; 80DECB8 asrs r6, 16 str r6, [sp, 0xC] mov r0, r8 - bl WriteSequenceToBgTileMapBuffer + bl WriteSequenceToBgTilemapBuffer mov r0, r8 bl sub_80DED60 add sp, 0x10 @@ -405180,7 +405181,7 @@ CreateShopMainMenu: ; 80DFA78 movs r2, 0 bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed ldrb r0, [r4, 0xE] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r4, 0xE] movs r1, 0x1 bl CopyWindowToVram @@ -405461,8 +405462,8 @@ sub_80DFD44: ; 80DFD44 sub_80DFD64: ; 80DFD64 push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl do_scheduled_bg_tilemap_copies_to_vram bl fade_and_return_progress_probably pop {r0} @@ -405472,8 +405473,8 @@ sub_80DFD64: ; 80DFD64 thumb_func_start sub_80DFD80 sub_80DFD80: ; 80DFD80 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -405543,9 +405544,9 @@ sub_80DFD94: ; 80DFD94 bl CpuFastSet bl remove_some_task bl reset_temp_tile_data_buffers - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator bl sub_80A1A74 - bl reset_all_obj_data + bl ResetAllObjectData bl clear_tasks bl clear_scheduled_bg_copies_to_vram ldr r4, =0x02039f70 @@ -405577,28 +405578,28 @@ sub_80DFD94: ; 80DFD94 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r4, [sp] str r4, [sp, 0x4] movs r0, 0x1 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r4, [sp] str r4, [sp, 0x4] movs r0, 0x2 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r4, [sp] str r4, [sp, 0x4] movs r0, 0x3 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 bl sub_80E0468 bl sub_80E0424 b @080DFEEE @@ -406111,16 +406112,16 @@ sub_80E031C: ; 80E031C ldr r0, =0x0000083e adds r4, r0 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag ldrb r1, [r5] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0xFF strb r0, [r5] @080E0356: @@ -406145,19 +406146,19 @@ sub_80E036C: ; 80E036C lsls r0, 4 adds r1, r0 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] movs r0, 0xC0 lsls r0, 5 adds r1, r0 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] movs r0, 0x80 lsls r0, 5 adds r1, r0 movs r0, 0x3 - bl SetBgTileMap + bl SetBgTilemap movs r0, 0x10 movs r1, 0 bl SetGpuReg @@ -406218,7 +406219,7 @@ sub_80E0424: ; 80E0424 ldr r0, =gUnknown_08D9B0F0 ldr r1, =0x02039f70 ldr r1, [r1] - bl call_LZZUnCompWram + bl LZDecompressWram ldr r0, =gUnknown_08D9B0C8 movs r1, 0xC0 movs r2, 0x20 @@ -406244,11 +406245,11 @@ sub_80E0468: ; 80E0468 movs r2, 0xE0 bl copy_textbox_border_tile_patterns_to_vram movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x2 - bl PutWindowTileMap + bl PutWindowTilemap pop {r0} bx r0 .pool @@ -406906,7 +406907,7 @@ sub_80E08F0: ; 80E08F0 adds r1, r3 adds r1, r5 ldrb r1, [r1] - bl obj_anim_image_start + bl StartObjectImageAnim @080E09D8: adds r0, r7, 0x1 lsls r0, 24 @@ -407075,7 +407076,7 @@ sub_80E0AC8: ; 80E0AC8 bl audio_play strh r5, [r4, 0xA] movs r0, 0x2 - bl ClearWindowTileMap + bl ClearWindowTilemap bl sub_80E0224 ldrb r0, [r4, 0xE] movs r1, 0x2 @@ -407363,11 +407364,11 @@ sub_80E0D88: ; 80E0D88 movs r1, 0 bl sub_8198070 movs r0, 0x4 - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0x3 - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap ldrh r0, [r5, 0xA] ldr r1, =0x02021cc4 bl itemid_get_name @@ -407406,9 +407407,9 @@ sub_80E0D88: ; 80E0D88 movs r1, 0 bl sub_8198070 movs r0, 0x4 - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0x3 - bl ClearWindowTileMap + bl ClearWindowTilemap adds r0, r4, 0 bl sub_80E10A0 @080E0EA4: @@ -407453,7 +407454,7 @@ sub_80E0EDC: ; 80E0EDC ldr r1, =0x03005e08 adds r4, r0, r1 movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap ldr r6, =0x02039f60 ldrb r0, [r6, 0xF] cmp r0, 0 @@ -407653,9 +407654,9 @@ sub_80E10A0: ; 80E10A0 movs r1, 0x1 bl sub_80E0250 movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x2 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram bl sub_80E01C8 @@ -410852,7 +410853,7 @@ CreateWindowFromRect: ; 80E2A1C lsls r4, 24 lsrs r4, 24 adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0 add sp, 0x20 pop {r4,r5} @@ -411322,8 +411323,8 @@ c2_choose_name_or_words_screen: ; 80E2E04 bl sub_80A1A74 b @080E2E86 @080E2E5E: - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator b @080E2E86 @080E2E68: bl clear_tasks @@ -411637,19 +411638,19 @@ choose_name_or_words_screen_init_bgs: ; 80E2FE4 bl SetGpuReg ldr r1, [r5] movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r5] movs r0, 0x80 lsls r0, 4 adds r1, r0 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r5] movs r2, 0x80 lsls r2, 5 adds r1, r2 movs r0, 0x3 - bl SetBgTileMap + bl SetBgTilemap movs r4, 0x20 str r4, [sp] str r4, [sp, 0x4] @@ -411657,21 +411658,21 @@ choose_name_or_words_screen_init_bgs: ; 80E2FE4 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r4, [sp] str r4, [sp, 0x4] movs r0, 0x2 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r4, [sp] str r4, [sp, 0x4] movs r0, 0x3 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 add sp, 0x10 pop {r3} mov r8, r3 @@ -411838,11 +411839,11 @@ sub_80E3294: ; 80E3294 bl sub_80E4964 bl sub_80E4EF0 movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r4, 0x1 negs r4, r4 adds r0, r4, 0 @@ -412708,7 +412709,7 @@ sub_80E3A74: ; 80E3A74 lsls r4, 24 lsrs r4, 24 movs r0, 0x4 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 20 movs r1, 0x87 @@ -412718,7 +412719,7 @@ sub_80E3A74: ; 80E3A74 add r6, sp, 0x8 strh r0, [r6] movs r0, 0x6 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 20 adds r0, r5 @@ -412726,14 +412727,14 @@ sub_80E3A74: ; 80E3A74 adds r1, 0xA strh r0, [r1] movs r0, 0x7 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 20 adds r0, r5 add r1, sp, 0xC strh r0, [r1] movs r0, 0x7 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 20 ldr r1, =0x00000101 @@ -412807,7 +412808,7 @@ sub_80E3B30: ; 80E3B30 beq @080E3B48 adds r0, r5, 0 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @080E3B48: ldrh r0, [r5, 0x36] movs r1, 0xFF @@ -412904,7 +412905,7 @@ sub_80E3B30: ; 80E3B30 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 4 ldr r2, =0x01010000 @@ -413030,7 +413031,7 @@ sub_80E3CE4: ; 80E3CE4 movs r1, 0x26 movs r2, 0x58 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r5, =0x02039f94 ldr r1, [r5] ldr r4, =0x00001e23 @@ -413216,7 +413217,7 @@ sub_80E3E3C: ; 80E3E3C lsls r0, 2 adds r0, r5 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim pop {r4,r5} pop {r0} bx r0 @@ -413270,7 +413271,7 @@ sub_80E3ED8: ; 80E3ED8 ldr r1, =0x02020630 adds r0, r1 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim pop {r0} bx r0 .pool @@ -413353,7 +413354,7 @@ sub_80E3F8C: ; 80E3F8C movs r1, 0xCC movs r2, 0x58 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r1, =0x02039f94 @@ -413369,7 +413370,7 @@ sub_80E3F8C: ; 80E3F8C add r5, r8 ldr r1, =gUnknown_0858C050 adds r0, r5, 0 - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable adds r1, r5, 0 adds r1, 0x3E ldrb r0, [r1] @@ -413380,7 +413381,7 @@ sub_80E3F8C: ; 80E3F8C movs r1, 0xCC movs r2, 0x54 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x3A] @@ -413390,7 +413391,7 @@ sub_80E3F8C: ; 80E3F8C add r4, r8 ldr r1, =gUnknown_0858C058 adds r0, r4, 0 - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable adds r4, 0x3E ldrb r0, [r4] orrs r0, r6 @@ -413399,7 +413400,7 @@ sub_80E3F8C: ; 80E3F8C movs r1, 0xCC movs r2, 0x53 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r2, r0, 4 @@ -413620,7 +413621,7 @@ sub_80E41B8: ; 80E41B8 lsls r4, r5, 1 adds r0, r4, r0 ldrh r0, [r0] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 4 mov r1, r8 ldrb r2, [r1, 0x5] @@ -413632,7 +413633,7 @@ sub_80E41B8: ; 80E41B8 ldr r0, =gUnknown_0858BEFE adds r4, r0 ldrh r0, [r4] - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag adds r1, r6, 0 adds r1, 0x40 strh r0, [r1] @@ -413662,7 +413663,7 @@ sub_80E4218: ; 80E4218 movs r1, 0xCC movs r2, 0x74 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r4, r0, 4 @@ -413674,7 +413675,7 @@ sub_80E4218: ; 80E4218 mov r8, r0 adds r0, r4, 0 mov r1, r8 - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable adds r4, 0x3E ldrb r0, [r4] movs r5, 0x4 @@ -413684,7 +413685,7 @@ sub_80E4218: ; 80E4218 movs r1, 0xCC movs r2, 0x8C movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r4, r0, 4 @@ -413693,7 +413694,7 @@ sub_80E4218: ; 80E4218 adds r4, r6 adds r0, r4, 0 mov r1, r8 - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable adds r4, 0x3E ldrb r0, [r4] orrs r0, r5 @@ -413720,7 +413721,7 @@ sub_80E4290: ; 80E4290 asrs r1, 16 movs r2, 0x38 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 ldr r3, =0x02020630 @@ -413758,7 +413759,7 @@ sub_80E4290: ; 80E4290 ldr r0, =gUnknown_0858C168 movs r2, 0x3C movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 lsls r0, r1, 4 @@ -413852,7 +413853,7 @@ sub_80E4384: ; 80E4384 orrs r1, r2 strb r1, [r0, 0x5] movs r1, 0x4 - bl obj_anim_image_start + bl StartObjectImageAnim add sp, 0x4 pop {r0} bx r0 @@ -413866,7 +413867,7 @@ sub_80E43E0: ; 80E43E0 movs r1, 0x38 movs r2, 0x29 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r4, r0, 4 @@ -413876,7 +413877,7 @@ sub_80E43E0: ; 80E43E0 adds r4, r0 ldr r1, =gUnknown_0858C078 adds r0, r4, 0 - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable ldrb r0, [r4, 0x5] movs r1, 0xC orrs r0, r1 @@ -413950,7 +413951,7 @@ sub_80E447C: ; 80E447C orrs r1, r2 strb r1, [r0, 0x5] movs r1, 0x4 - bl obj_anim_image_start + bl StartObjectImageAnim add sp, 0x4 pop {r0} bx r0 @@ -414498,7 +414499,7 @@ sub_80E4894: ; 80E4894 ldr r0, [r5] adds r0, r4 ldrb r0, [r0] - bl PutWindowTileMap + bl PutWindowTilemap add sp, 0xC pop {r4,r5} pop {r0} @@ -414550,7 +414551,7 @@ sub_80E48E8: ; 80E48E8 ldr r0, [r5] adds r0, r4 ldrb r0, [r0] - bl PutWindowTileMap + bl PutWindowTilemap add sp, 0x2C pop {r4,r5} pop {r0} @@ -414775,7 +414776,7 @@ sub_80E4AF8: ; 80E4AF8 strb r1, [r0] bl sub_80E4D10 movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, [r6] adds r0, r5 adds r0, r4 @@ -414822,7 +414823,7 @@ sub_80E4B54: ; 80E4B54 bl sub_80E4BBC bl sub_80E4D10 movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x5 bl audio_play bl sub_80E4AB4 @@ -414957,9 +414958,9 @@ choose_name_or_words_screen_load_bg_tile_patterns: ; 80E4C54 movs r3, 0 bl LoadBgTiles ldr r0, =gUnknown_0858C1C8 - bl gpu_tile_obj_alloc_and_load_multiple + bl LoadObjectPics ldr r0, =gUnknown_0858C230 - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes pop {r4-r6} pop {r0} bx r0 @@ -415003,7 +415004,7 @@ sub_80E4CF8: ; 80E4CF8 lsrs r0, 24 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer pop {r0} bx r0 thumb_func_end sub_80E4CF8 @@ -415101,7 +415102,7 @@ sub_80E4D10: ; 80E4D10 ldr r0, [r5] adds r0, r4 ldrb r0, [r0] - bl PutWindowTileMap + bl PutWindowTilemap add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -415159,7 +415160,7 @@ sub_80E4DE4: ; 80E4DE4 cmp r4, 0x3 bls @080E4E0E adds r0, r6, 0 - bl PutWindowTileMap + bl PutWindowTilemap add sp, 0xC pop {r3} mov r8, r3 @@ -415222,7 +415223,7 @@ sub_80E4E5C: ; 80E4E5C adds r0, r5, 0 bl nullsub_10 adds r0, r6, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram pop {r4-r6} pop {r0} bx r0 @@ -415260,7 +415261,7 @@ sub_80E4EF0: ; 80E4EF0 ldr r0, [r5] adds r0, r4 ldrb r0, [r0] - bl PutWindowTileMap + bl PutWindowTilemap ldr r0, [r5] adds r0, r4 ldrb r0, [r0] @@ -415277,8 +415278,8 @@ sub_80E4EF0: ; 80E4EF0 sub_80E4F58: ; 80E4F58 push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r0} bx r0 @@ -415308,8 +415309,8 @@ sub_80E4F84: ; 80E4F84 thumb_func_start sub_80E4F94 sub_80E4F94: ; 80E4F94 push {r4,r5,lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram ldr r5, =0x02039f94 ldr r0, [r5] @@ -415779,7 +415780,7 @@ sub_80E52EC: ; 80E52EC movs r1, 0 bl FillWindowPixelBuffer ldrb r0, [r4] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r4] movs r1, 0x1 bl CopyWindowToVram @@ -415840,9 +415841,9 @@ AddMoneyTextObject: ; 80E53AC lsls r5, 16 lsrs r5, 16 ldr r0, =gUnknown_0858C2A4 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_0858C2AC - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette ldr r0, =gUnknown_0858C28C lsls r4, 16 asrs r4, 16 @@ -415851,7 +415852,7 @@ AddMoneyTextObject: ; 80E53AC adds r1, r4, 0 adds r2, r5, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, =0x02039f99 strb r0, [r1] pop {r4,r5} @@ -415870,7 +415871,7 @@ sub_80E53F4: ; 80E53F4 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_resources + bl RemoveObjectAndFreeResources pop {r0} bx r0 .pool @@ -425173,7 +425174,7 @@ sub_80E9E90: ; 80E9E90 movs r1, 0 bl sub_819746C ldrb r0, [r4, 0xC] - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r4, 0xC] bl RemoveWindow movs r0, 0 @@ -425313,9 +425314,9 @@ sub_80E9FFC: ; 80E9FFC movs r1, 0 bl sub_819746C ldrb r0, [r4, 0xC] - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r4, 0xE] - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r4, 0xE] bl RemoveWindow movs r0, 0 @@ -425485,7 +425486,7 @@ sub_80EA18C: ; 80EA18C movs r1, 0 bl sub_819746C ldrb r0, [r5, 0xE] - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r5, 0xE] bl RemoveWindow movs r0, 0 @@ -445557,7 +445558,7 @@ sub_80F57C4: ; 80F57C4 adds r1, 0xC adds r1, r2 ldr r1, [r1] - bl SetBgTileMap + bl SetBgTilemap adds r4, 0x1 cmp r4, 0x3 ble @080F57E0 @@ -445664,22 +445665,22 @@ sub_80F591C: ; 80F591C ldr r0, =gUnknown_08C19588 movs r1, 0xC0 lsls r1, 19 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r1, =gUnknown_08C1A12C movs r0, 0x3 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer ldr r1, =gUnknown_08C1A000 movs r0, 0x2 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer ldr r1, =gUnknown_08C19EEC movs r0, 0 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer bl sub_80F71C8 ldr r0, =gUnknown_08C1A2B4 movs r2, 0x80 @@ -445756,7 +445757,7 @@ sub_80F591C: ; 80F591C movs r0, 0x1 adds r2, r4, 0 lsrs r3, r7, 24 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 mov r2, r8 str r2, [sp] str r2, [sp, 0x4] @@ -445765,7 +445766,7 @@ sub_80F591C: ; 80F591C adds r2, r4, 0 mov r4, r9 lsrs r3, r4, 24 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 adds r6, 0x1 cmp r6, 0x9 ble @080F59B0 @@ -445773,13 +445774,13 @@ sub_80F591C: ; 80F591C cmp r7, 0x3 ble @080F5976 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0 bl ShowBg movs r0, 0x1 @@ -445855,7 +445856,7 @@ sub_80F5AE0: ; 80F5AE0 cmp r4, 0x3 ble @080F5AE4 movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram pop {r4} pop {r0} bx r0 @@ -445876,9 +445877,9 @@ sub_80F5B00: ; 80F5B00 bl sub_80F57C4 bl dp12_8087EA4 bl sub_80A1A74 - bl reset_all_obj_data + bl ResetAllObjectData bl clear_tasks - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator bl sub_80F591C bl sub_80F6A9C movs r0, 0 @@ -445956,14 +445957,14 @@ sub_80F5B00: ; 80F5B00 thumb_func_start sub_80F5C00 sub_80F5C00: ; 80F5C00 push {lr} - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl run_active_tasks bl fade_and_return_progress_probably movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram pop {r0} bx r0 thumb_func_end sub_80F5C00 @@ -446019,8 +446020,8 @@ sub_80F5C24: ; 80F5C24 ldrh r1, [r0] movs r0, 0x46 bl SetGpuReg - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram bl sub_80BA0A8 pop {r0} @@ -446929,7 +446930,7 @@ sub_80F6404: ; 80F6404 ldr r1, [r1, 0x8] adds r2, r6, 0 adds r3, r4, 0 - bl help_system_enable_unless_flashback__sp199 + bl DecompressMonPic_DetectFrontOrBack_2 b @080F64F2 .pool @080F64E0: @@ -446940,14 +446941,14 @@ sub_80F6404: ; 80F6404 ldr r1, [r1, 0x8] adds r2, r6, 0 adds r3, r4, 0 - bl sub_8034B50 + bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack @080F64F2: adds r0, r6, 0 adds r1, r5, 0 adds r2, r4, 0 bl sub_806E7CC adds r4, r0, 0 - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette adds r0, r6, 0 movs r1, 0x1 bl sub_806A068 @@ -446958,7 +446959,7 @@ sub_80F6404: ; 80F6404 lsls r1, 1 movs r2, 0x50 movs r3, 0xA - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r5, =0x02020630 @@ -446981,9 +446982,9 @@ sub_80F6404: ; 80F6404 ldr r1, [r1] strb r0, [r1, 0x8] ldr r0, =gUnknown_0858D878 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_0858D880 - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette ldr r0, =sub_80F7670 movs r1, 0xA bl AddTask @@ -447557,7 +447558,7 @@ sub_80F69B8: ; 80F69B8 movs r0, 0x1 str r0, [sp, 0xC] movs r2, 0x3 - bl WriteSequenceToBgTileMapBuffer + bl WriteSequenceToBgTilemapBuffer b @080F6A54 .pool @080F6A40: @@ -447670,7 +447671,7 @@ sub_80F6AE8: ; 80F6AE8 movs r1, 0x1 strb r1, [r0] ldr r0, =gUnknown_0858D8E0 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic adds r1, r0, 0 lsls r1, 16 movs r0, 0x1 @@ -447685,7 +447686,7 @@ sub_80F6AE8: ; 80F6AE8 movs r1, 0x8 movs r2, 0x8 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -447994,13 +447995,13 @@ sub_80F6DC0: ; 80F6DC0 movs r4, 0x7 @080F6DD6: adds r0, r6, 0 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic adds r6, 0x8 subs r4, 0x1 cmp r4, 0 bge @080F6DD6 ldr r0, =gUnknown_0858D850 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette movs r4, 0 mov r6, sp @080F6DEE: @@ -448009,7 +448010,7 @@ sub_80F6DC0: ; 80F6DC0 lsls r1, 1 movs r2, 0x90 movs r3, 0xA - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r1, r5, r4 strb r0, [r1] ldrh r0, [r6] @@ -448497,7 +448498,7 @@ sub_80F71C8: ; 80F71C8 str r0, [sp, 0x4] movs r2, 0x5 movs r3, 0x1 - bl CopyToBgTileMapBufferRect + bl CopyToBgTilemapBufferRect movs r5, 0xA b @080F7240 .pool @@ -448535,7 +448536,7 @@ sub_80F71C8: ; 80F71C8 @080F7236: movs r2, 0x5 movs r3, 0x1 - bl CopyToBgTileMapBufferRect + bl CopyToBgTilemapBufferRect movs r5, 0xF @080F7240: ldr r0, =0x02039f2c @@ -448566,7 +448567,7 @@ sub_80F71C8: ; 80F71C8 str r0, [sp] str r6, [sp, 0x4] movs r0, 0x2 - bl CopyToBgTileMapBufferRect + bl CopyToBgTilemapBufferRect b @080F72CC .pool @080F7290: @@ -448583,7 +448584,7 @@ sub_80F71C8: ; 80F71C8 str r0, [sp] movs r0, 0x2 str r0, [sp, 0x4] - bl CopyToBgTileMapBufferRect + bl CopyToBgTilemapBufferRect b @080F72CC .pool @080F72B4: @@ -448597,7 +448598,7 @@ sub_80F71C8: ; 80F71C8 str r0, [sp] movs r0, 0x2 str r0, [sp, 0x4] - bl CopyToBgTileMapBufferRect + bl CopyToBgTilemapBufferRect @080F72CC: adds r5, 0x5 ldr r1, =gUnknown_08DC6510 @@ -448608,7 +448609,7 @@ sub_80F71C8: ; 80F71C8 str r0, [sp] movs r0, 0x2 str r0, [sp, 0x4] - bl CopyToBgTileMapBufferRect + bl CopyToBgTilemapBufferRect ldr r0, =0x0203a034 ldr r0, [r0] ldr r1, [r0, 0x14] @@ -448620,7 +448621,7 @@ sub_80F71C8: ; 80F71C8 movs r0, 0x2 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette add sp, 0xC pop {r4-r6} pop {r0} @@ -448804,7 +448805,7 @@ sub_80F73DC: ; 80F73DC movs r0, 0x2 adds r1, r4, 0 movs r2, 0x1 - bl WriteSequenceToBgTileMapBuffer + bl WriteSequenceToBgTilemapBuffer adds r4, 0x10 lsls r4, 16 lsrs r4, 16 @@ -448823,7 +448824,7 @@ sub_80F73DC: ; 80F73DC movs r0, 0x2 adds r1, r4, 0 movs r2, 0x1 - bl WriteSequenceToBgTileMapBuffer + bl WriteSequenceToBgTilemapBuffer ldr r0, =0x0203a034 ldr r0, [r0] ldr r1, [r0] @@ -448886,7 +448887,7 @@ sub_80F74BC: ; 80F74BC str r0, [sp, 0x8] movs r0, 0x2 movs r2, 0 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -449107,7 +449108,7 @@ sub_80F7670: ; 80F7670 adds r0, r4, 0 movs r2, 0x2C movs r3, 0x5 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -449225,7 +449226,7 @@ sub_80F7768: ; 80F7768 ble @080F77D6 @080F77C6: adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r5] ldr r1, [r0] ldrb r0, [r1, 0x7] @@ -449619,7 +449620,7 @@ sub_80F7A80: ; 80F7A80 str r0, [sp] str r0, [sp, 0x4] ldr r1, =0x000060b3 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 ldr r0, =sub_80F7CA8 movs r1, 0xA bl AddTask @@ -449713,7 +449714,7 @@ sub_80F7A80: ; 80F7A80 str r7, [sp] str r7, [sp, 0x4] movs r0, 0x1 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 ldr r0, =sub_80F7CA8 movs r1, 0xA bl AddTask @@ -449982,7 +449983,7 @@ sub_80F7CA8: ; 80F7CA8 str r0, [sp, 0x4] movs r0, 0x2 lsrs r3, 24 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 adds r2, r4, 0 cmp r2, 0xA ble @080F7D56 @@ -450148,7 +450149,7 @@ sub_80F7ED0: ; 80F7ED0 lsls r4, 24 lsrs r4, 24 adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap add sp, 0x10 pop {r4} pop {r0} @@ -451887,7 +451888,7 @@ sub_80F8D28: ; 80F8D28 ldr r1, [r1, 0x8] adds r2, r6, 0 adds r3, r5, 0 - bl help_system_enable_unless_flashback__sp199 + bl DecompressMonPic_DetectFrontOrBack_2 b @080F8DD8 .pool @080F8DC4: @@ -451899,14 +451900,14 @@ sub_80F8D28: ; 80F8D28 ldr r1, [r1, 0x8] adds r2, r6, 0 adds r3, r5, 0 - bl sub_8034B50 + bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack @080F8DD8: adds r0, r6, 0 mov r1, r8 adds r2, r5, 0 bl sub_806E7CC adds r4, r0, 0 - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette adds r0, r6, 0 movs r1, 0x1 bl sub_806A068 @@ -451927,7 +451928,7 @@ sub_80F8D28: ; 80F8D28 adds r2, r3 asrs r2, 16 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r5, r0, 24 ldr r0, =0x02039f2a @@ -452071,10 +452072,10 @@ sub_80F8EE8: ; 80F8EE8 adds r4, r0, r1 ldrb r0, [r4, 0x5] lsrs r0, 4 - bl gpu_pal_tag_by_index + bl GetObjectPaletteTagBySlot lsls r0, 16 lsrs r0, 16 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag ldrb r0, [r4, 0x1] lsls r0, 30 cmp r0, 0 @@ -452085,7 +452086,7 @@ sub_80F8EE8: ; 80F8EE8 bl rotscale_free_entry @080F8F72: adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @080F8F78: ldrh r0, [r5, 0x8] adds r0, 0x1 @@ -454339,7 +454340,7 @@ sub_80FA13C: ; 80FA13C lsls r2, 16 asrs r2, 16 movs r3, 0x94 - bl obj_add_from_template_forward_search + bl AddObjectToFront movs r0, 0 pop {r4} pop {r1} @@ -454496,7 +454497,7 @@ sub_80FA248: ; 80FA248 lsls r2, 16 asrs r2, 16 movs r3, 0x94 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r0, [r4, 0x1C] cmp r0, 0x1 beq @080FA2B2 @@ -454647,7 +454648,7 @@ sub_80FA3AC: ; 80FA3AC lsls r2, 16 asrs r2, 16 movs r3, 0x94 - bl obj_add_from_template_forward_search + bl AddObjectToFront movs r0, 0 pop {r4} pop {r1} @@ -455338,7 +455339,7 @@ sub_80FA9A4: ; 80FA9A4 cmp r0, 0x1F ble @080FA9CA adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @080FA9CA: pop {r4} pop {r0} @@ -455381,7 +455382,7 @@ sub_80FA9D0: ; 80FA9D0 movs r3, 0 ldrsh r2, [r4, r3] movs r3, 0 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -455478,7 +455479,7 @@ sub_80FAA7C: ; 80FAA7C ldrb r2, [r2] adds r2, 0x20 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront b @080FAB8C .pool @080FAAFC: @@ -455519,7 +455520,7 @@ sub_80FAA7C: ; 80FAA7C adds r2, 0x10 @080FAB4C: movs r3, 0x94 - bl obj_add_from_template_forward_search + bl AddObjectToFront b @080FAB8C .pool @080FAB64: @@ -455541,7 +455542,7 @@ sub_80FAA7C: ; 80FAA7C ldrb r2, [r2] adds r2, 0x10 movs r3, 0x94 - bl obj_add_from_template_forward_search + bl AddObjectToFront @080FAB8C: movs r0, 0 add sp, 0x4 @@ -456062,12 +456063,12 @@ sub_80FAFF8: ; 80FAFF8 sub_80FB00C: ; 80FB00C push {r4,r5,lr} ldr r0, =gUnknown_0858E864 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette ldr r0, =gUnknown_0858E880 movs r1, 0 movs r2, 0 movs r3, 0x52 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 @@ -456123,9 +456124,9 @@ sub_80FB074: ; 80FB074 cmp r1, r0 bne @080FB098 adds r0, r4, 0 - bl obj_free_pal + bl FreeObjectPalette adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @080FB098: adds r4, 0x44 adds r6, 0x44 @@ -456923,7 +456924,7 @@ sub_80FB6EC: ; 80FB6EC lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim b @080FB75E .pool @080FB74C: @@ -456933,7 +456934,7 @@ sub_80FB6EC: ; 80FB6EC lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @080FB75E: add sp, 0x4 pop {r4} @@ -457314,7 +457315,7 @@ sub_80FB9FC: ; 80FB9FC movs r1, 0 movs r2, 0 movs r3, 0x94 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 @@ -457532,7 +457533,7 @@ sub_80FBB64: ; 80FBB64 overworld_free_bgmaps: ; 80FBC00 push {lr} ldr r0, =gUnknown_08591D58 - bl gpu_tile_obj_alloc_and_load_multiple + bl LoadObjectPics pop {r0} bx r0 .pool @@ -457618,7 +457619,7 @@ sub_80FBC10: ; 80FBC10 adds r0, r4, 0 bl obj_free_rotscale_entry adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0x40 strb r0, [r5] @080FBCB4: @@ -462973,7 +462974,7 @@ sub_80FE930: ; 80FE930 ldr r5, =0x0203841e ldrb r1, [r5, 0x6] adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r0, [r5, 0x4] strh r0, [r4, 0x2E] ldr r5, =0x02038437 @@ -463049,7 +463050,7 @@ sub_80FE9E4: ; 80FE9E4 cmp r0, 0 beq @080FE9FA adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles b @080FEA4E @080FE9FA: movs r1, 0x38 @@ -463141,7 +463142,7 @@ sub_80FEA58: ; 80FEA58 adds r0, r4, 0 movs r1, 0 movs r2, 0 - bl obj_add_from_template_call_callback_once + bl AddObjectAndAnimateForOneFrame @080FEAB2: movs r1, 0xA ldrsh r0, [r5, r1] @@ -463217,7 +463218,7 @@ sub_80FEB44: ; 80FEB44 movs r0, 0x7 ands r1, r0 adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 @@ -463422,7 +463423,7 @@ sub_80FECF0: ; 80FECF0 strb r0, [r2] adds r0, r4, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0x3C strh r0, [r4, 0x2E] ldr r0, =sub_80A64B0 @@ -463445,7 +463446,7 @@ sub_80FED28: ; 80FED28 ldr r5, =0x0203841e ldrb r1, [r5, 0x8] adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0x1 @@ -464747,7 +464748,7 @@ sub_80FF768: ; 80FF768 strb r0, [r1] ldrb r1, [r4, 0x6] adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r0, [r4, 0x8] strh r0, [r5, 0x32] ldrh r0, [r5, 0x2E] @@ -464856,7 +464857,7 @@ sub_80FF7EC: ; 80FF7EC strb r0, [r1] ldrb r1, [r6, 0x8] mov r0, r9 - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r0, [r6, 0xA] mov r1, r9 strh r0, [r1, 0x32] @@ -465854,7 +465855,7 @@ sub_80FFFC0: ; 80FFFC0 movs r3, 0x1A ldrsh r2, [r5, r3] ldrb r3, [r5, 0x10] - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0xC] @@ -466105,7 +466106,7 @@ sub_8100128: ; 8100128 strb r0, [r1] ldrb r1, [r6, 0xE] adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r4, 0 bl sub_80A68D4 ldrh r0, [r6, 0x8] @@ -466177,7 +466178,7 @@ sub_8100128: ; 8100128 strb r0, [r1] ldrb r1, [r6, 0xE] adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r4, 0 bl sub_80A68D4 ldrh r0, [r6, 0x8] @@ -466236,7 +466237,7 @@ sub_8100128: ; 8100128 strb r1, [r0] ldrb r1, [r6, 0xE] adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r4, 0 bl sub_80A68D4 ldrh r0, [r6, 0x8] @@ -466290,7 +466291,7 @@ sub_8100128: ; 8100128 strb r1, [r0] ldrb r1, [r6, 0xE] adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r4, 0 bl sub_80A68D4 ldrh r0, [r6, 0x8] @@ -466347,7 +466348,7 @@ sub_8100128: ; 8100128 strb r0, [r1] ldrb r1, [r6, 0xE] adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r4, 0 bl sub_80A68D4 ldrh r0, [r6, 0x8] @@ -466399,7 +466400,7 @@ sub_8100128: ; 8100128 strb r1, [r0] ldrb r1, [r6, 0xE] adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r4, 0 bl sub_80A68D4 ldrh r0, [r6, 0x8] @@ -466415,7 +466416,7 @@ sub_8100128: ; 8100128 cmp r0, 0 beq @081004FC adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldrh r0, [r6, 0x8] adds r0, 0x1 b @081004FA @@ -466502,7 +466503,7 @@ sub_8100524: ; 8100524 lsls r2, 16 asrs r2, 16 ldrb r3, [r6, 0x10] - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -466532,7 +466533,7 @@ sub_8100524: ; 8100524 strh r0, [r1, 0x22] ldrb r1, [r6, 0xE] adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r0, [r6, 0x10] adds r4, 0x43 strb r0, [r4] @@ -466599,7 +466600,7 @@ sub_81005D4: ; 81005D4 subs r0, 0x1 strh r0, [r1] adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08100636: pop {r4} pop {r0} @@ -466819,7 +466820,7 @@ sub_81007C4: ; 81007C4 .pool @081007E8: ldr r0, =0x0000274f - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 20 movs r2, 0x80 @@ -466828,7 +466829,7 @@ sub_81007C4: ; 81007C4 adds r0, r4 strh r0, [r5, 0x18] ldr r0, =0x000027b0 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 20 adds r0, r4 @@ -467129,7 +467130,7 @@ sub_8100A50: ; 8100A50 bne @08100A6A adds r0, r5, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim @08100A6A: ldr r0, =sub_81009DC str r0, [r5, 0x1C] @@ -467574,14 +467575,14 @@ sub_8100D38: ; 8100D38 lsls r0, 2 ldr r4, =0x02020630 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0x30 ldrsh r1, [r5, r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r5, 0 bl move_anim_8072740 @08100E10: @@ -467618,7 +467619,7 @@ sub_8100E1C: ; 8100E1C ldr r4, =0x0203841e ldrb r1, [r4, 0xA] adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r0, [r4, 0x6] negs r0, r0 strh r0, [r5, 0x30] @@ -467771,7 +467772,7 @@ sub_8100EF0: ; 8100EF0 ldrh r0, [r0, 0x4] strh r0, [r5, 0x2E] ldr r0, =0x00002828 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 20 movs r1, 0x80 @@ -468396,7 +468397,7 @@ sub_8101440: ; 8101440 strh r0, [r4, 0x22] adds r0, r4, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim @0810148E: ldr r0, =sub_81014A0 str r0, [r4, 0x1C] @@ -469857,7 +469858,7 @@ sub_8101FF0: ; 8101FF0 strh r0, [r4, 0x22] adds r0, r4, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim strh r6, [r4, 0x2E] strh r6, [r4, 0x30] ldr r0, =sub_810208C @@ -470641,7 +470642,7 @@ sub_81025C0: ; 81025C0 mov r2, r8 bl sub_80A8048 ldr r0, =0x000027d2 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 24 movs r4, 0x80 @@ -470652,7 +470653,7 @@ sub_81025C0: ; 81025C0 orrs r0, r1 mov r10, r0 ldr r0, =0x000027d3 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 24 lsls r4, r0 @@ -471086,7 +471087,7 @@ sub_81029B4: ; 81029B4 lsrs r0, 24 strh r0, [r6, 0x8] ldr r0, =0x00002771 - bl gpu_pal_alloc_new + bl AllocObjectPalette lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0xA] @@ -471238,7 +471239,7 @@ sub_8102AE0: ; 8102AE0 bl SetGpuRegBits @08102B26: ldr r0, =0x00002771 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag adds r0, r4, 0 bl move_anim_task_del @08102B32: @@ -471346,7 +471347,7 @@ sub_8102BE8: ; 8102BE8 mov r9, r0 ldr r4, =gUnknown_08593020 ldrh r0, [r4] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0xFF @@ -471382,7 +471383,7 @@ sub_8102BE8: ; 8102BE8 mov r1, r8 adds r0, r5, r1 ldrh r0, [r0] - bl gpu_pal_alloc_new + bl AllocObjectPalette lsls r0, 24 lsrs r3, r0, 24 adds r4, 0x1 @@ -471442,7 +471443,7 @@ sub_8102CA0: ; 8102CA0 lsls r0, 2 adds r0, r6 ldrh r0, [r0] - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -471465,7 +471466,7 @@ sub_8102CD4: ; 8102CD4 ldr r4, =0x0203841e ldrb r1, [r4] adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r2, =gUnknown_08593020 movs r0, 0x2 ldrsh r1, [r4, r0] @@ -471474,7 +471475,7 @@ sub_8102CD4: ; 8102CD4 lsls r0, 2 adds r0, r2 ldrh r0, [r0] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF @@ -471677,7 +471678,7 @@ sub_8102DE4: ; 8102DE4 lsls r0, 2 adds r0, r2 ldrh r0, [r0] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF @@ -471732,7 +471733,7 @@ sub_8102EB0: ; 8102EB0 strh r0, [r6, 0x22] ldrb r1, [r4] adds r0, r6, 0 - bl obj_anim_image_start + bl StartObjectImageAnim strh r5, [r6, 0x32] strh r5, [r6, 0x34] ldrh r0, [r6, 0x20] @@ -471885,7 +471886,7 @@ sub_8103028: ; 8103028 ldr r5, =0x0203841e ldrb r1, [r5, 0x2] adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r2, =gUnknown_08593020 movs r0, 0x4 ldrsh r1, [r5, r0] @@ -471894,7 +471895,7 @@ sub_8103028: ; 8103028 lsls r0, 2 adds r0, r2 ldrh r0, [r0] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF @@ -472064,7 +472065,7 @@ sub_8103164: ; 8103164 adds r0, r1, 0x2 strh r0, [r5, 0x30] adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r1, =sub_81031D0 adds r0, r5, 0 bl oamt_set_x3A_32 @@ -472093,7 +472094,7 @@ sub_81031D0: ; 81031D0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] @081031F8: @@ -472324,14 +472325,14 @@ sub_8103390: ; 8103390 bne @081033D4 adds r0, r5, 0 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0x2 b @081033DE .pool @081033D4: adds r0, r5, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0x3 @081033DE: strh r0, [r5, 0x2E] @@ -472360,7 +472361,7 @@ sub_81033F0: ; 81033F0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r1, =sub_810342C adds r0, r4, 0 bl oamt_set_x3A_32 @@ -473078,7 +473079,7 @@ sub_81039CC: ; 81039CC subs r1, 0x1 strh r1, [r0, 0xA] adds r0, r3, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @081039F6: pop {r0} bx r0 @@ -473384,7 +473385,7 @@ sub_8103C0C: ; 8103C0C subs r3, r4 lsls r3, 24 lsrs r3, 24 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 mov r12, r0 @@ -473813,7 +473814,7 @@ sub_8103FE8: ; 8103FE8 bl sub_80A69CC ldr r0, =gUnknown_085934A0 ldrh r0, [r0, 0x2] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 20 movs r1, 0x80 @@ -474253,7 +474254,7 @@ sub_8104364: ; 8104364 movs r6, 0x10 adds r0, r5, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim @08104390: lsls r0, r7, 16 asrs r0, 16 @@ -474338,7 +474339,7 @@ sub_8104414: ; 8104414 lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @08104448: mov r0, r8 lsls r1, r0, 16 @@ -474405,7 +474406,7 @@ sub_81044BC: ; 81044BC beq @08104520 adds r0, r4, 0 movs r1, 0 - bl obj_anim_image_seek + bl SeekObjectImageAnim adds r2, r4, 0 adds r2, 0x2C ldrb r0, [r2] @@ -474489,7 +474490,7 @@ sub_8104530: ; 8104530 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =sub_8104594 str r0, [r4, 0x1C] @0810458A: @@ -474903,7 +474904,7 @@ sub_8104800: ; 8104800 lsls r3, 30 lsrs r3, 30 adds r0, r4, 0 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft @081048DA: pop {r3,r4} mov r8, r3 @@ -475197,7 +475198,7 @@ sub_8104B1C: ; 8104B1C bne @08104B50 adds r0, r4, 0 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -475211,7 +475212,7 @@ sub_8104B1C: ; 8104B1C @08104B50: adds r0, r4, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -476391,7 +476392,7 @@ sub_81054E8: ; 81054E8 push {r4,lr} adds r4, r0, 0 ldr r0, =0x000027db - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF @@ -477253,7 +477254,7 @@ sub_8105B08: ; 8105B08 movs r3, 0x26 ldrsh r2, [r4, r3] movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -477369,7 +477370,7 @@ sub_8105C48: ; 8105C48 subs r0, 0x1 strh r0, [r1] adds r0, r3, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08105CAA: pop {r4} pop {r0} @@ -477384,7 +477385,7 @@ sub_8105CB4: ; 8105CB4 lsls r0, 24 lsrs r6, r0, 24 ldr r0, =0x000027de - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag mov r1, sp strb r0, [r1] movs r4, 0x1 @@ -477394,7 +477395,7 @@ sub_8105CB4: ; 8105CB4 subs r0, r5, r4 lsls r0, 16 lsrs r0, 16 - bl gpu_pal_alloc_new + bl AllocObjectPalette mov r2, sp adds r1, r2, r4 strb r0, [r1] @@ -477412,7 +477413,7 @@ sub_8105CB4: ; 8105CB4 adds r0, r2 str r1, [r0] ldr r0, =gUnknown_08C22610 - bl call_LZZUnCompWram + bl LZDecompressWram movs r4, 0 @08105D00: ldr r5, =0x020244d4 @@ -477464,7 +477465,7 @@ sub_8105D60: ; 8105D60 movs r4, 0x2 @08105D6A: ldrh r0, [r5] - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag adds r5, 0x2 subs r4, 0x1 cmp r4, 0 @@ -477509,7 +477510,7 @@ sub_8105D88: ; 8105D88 lsls r2, 1 adds r2, r0 ldrh r0, [r2] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 4 ldrb r2, [r5, 0x5] movs r1, 0xF @@ -479157,7 +479158,7 @@ sub_8106B54: ; 8106B54 strh r0, [r4, 0x22] adds r0, r4, 0 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A82E4 @@ -479309,7 +479310,7 @@ sub_8106C80: ; 8106C80 strh r0, [r4, 0x22] ldrb r1, [r1, 0x4] adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] @@ -479389,7 +479390,7 @@ sub_8106CD0: ; 8106CD0 lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =sub_8106D5C str r0, [r5, 0x1C] @08106D50: @@ -479419,7 +479420,7 @@ sub_8106D5C: ; 8106D5C lsls r1, 24 lsrs r1, 24 adds r0, r2, 0 - bl obj_anim_image_start + bl StartObjectImageAnim b @08106D8C @08106D86: adds r0, r2, 0 @@ -479675,7 +479676,7 @@ sub_8106F60: ; 8106F60 strh r0, [r6, 0x22] ldrb r1, [r4, 0x2] adds r0, r6, 0 - bl obj_anim_image_start + bl StartObjectImageAnim strh r5, [r6, 0x38] ldrh r0, [r4, 0x4] strh r0, [r6, 0x34] @@ -479979,7 +479980,7 @@ sub_8107188: ; 8107188 ldr r0, =gUnknown_08595020 adds r1, r4, 0 movs r3, 0x4 - bl obj_add_from_template_forward_search + bl AddObjectToFront @081071F8: movs r0, 0x8 ldrsh r1, [r5, r0] @@ -480030,7 +480031,7 @@ sub_8107228: ; 8107228 cmp r0, 0 beq @0810725A adds r0, r2, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0810725A: pop {r0} bx r0 @@ -480216,7 +480217,7 @@ sub_8107380: ; 8107380 ldr r0, =sub_8107408 str r0, [r5, 0x1C] adds r0, r7, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @081073F6: add sp, 0x4 pop {r3} @@ -480337,7 +480338,7 @@ sub_81074E4: ; 81074E4 bne @08107506 adds r0, r4, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim adds r2, r4, 0 adds r2, 0x2C ldrb r1, [r2] @@ -480373,7 +480374,7 @@ sub_8107528: ; 8107528 ldrh r0, [r0] strh r0, [r4, 0x8] ldr r0, =0x0000279c - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 20 movs r1, 0x80 @@ -482240,7 +482241,7 @@ sub_8108408: ; 8108408 mov r1, r10 mov r2, r9 ldr r3, [sp, 0x8] - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 lsls r6, r5, 16 @@ -482398,7 +482399,7 @@ sub_810851C: ; 810851C subs r0, 0x1 strh r0, [r1] adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @081085BE: pop {r4} pop {r0} @@ -482598,7 +482599,7 @@ sub_810871C: ; 810871C ldrsh r1, [r4, r2] movs r2, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -482679,7 +482680,7 @@ sub_81087C0: ; 81087C0 movs r3, 0x22 ldrsh r2, [r5, r3] movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x30] @@ -482721,7 +482722,7 @@ sub_81087C0: ; 81087C0 str r1, [r0] @08108850: adds r0, r5, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08108856: pop {r4,r5} pop {r0} @@ -482782,7 +482783,7 @@ sub_810886C: ; 810886C lsrs r0, 27 bl rotscale_free_entry adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @081088D8: pop {r4} pop {r0} @@ -483041,7 +483042,7 @@ sub_8108AC0: ; 8108AC0 movs r3, 0x10 ldrsh r2, [r6, r3] movs r3, 0xA - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -483148,7 +483149,7 @@ sub_8108B94: ; 8108B94 subs r0, 0x1 strh r0, [r2, 0x18] adds r0, r5, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08108BC6: adds r0, r4, 0x1 lsls r0, 16 @@ -483249,7 +483250,7 @@ sub_8108C54: ; 8108C54 adds r0, r4, 0 bl obj_free_rotscale_entry adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08108C8C: pop {r4} pop {r0} @@ -483425,7 +483426,7 @@ sub_8108D54: ; 8108D54 mov r3, r10 asrs r2, r3, 16 movs r3, 0x82 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 ldr r1, =0x02020630 @@ -483480,7 +483481,7 @@ sub_8108D54: ; 8108D54 mov r3, r10 asrs r2, r3, 16 movs r3, 0x82 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 ldr r1, =0x02020630 @@ -484706,7 +484707,7 @@ sub_81097B4: ; 81097B4 ldr r3, [sp, 0x4] asrs r2, r3, 16 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -484809,7 +484810,7 @@ sub_81098EC: ; 81098EC subs r0, 0x1 strh r0, [r1] adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08109926: pop {r4} pop {r0} @@ -485089,7 +485090,7 @@ sub_8109AFC: ; 8109AFC ldr r4, =0x0203841e ldrb r1, [r4, 0x4] adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r0, [r4, 0x4] strh r0, [r5, 0x3C] ldr r0, =0x02038436 @@ -486846,7 +486847,7 @@ sub_810A834: ; 810A834 lsls r2, 16 asrs r2, 16 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r5, r0, 24 adds r0, r7, 0x1 @@ -486944,7 +486945,7 @@ sub_810A9DC: ; 810A9DC cmp r0, 0xF bne @0810AA26 adds r0, r3, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0810AA26: pop {r0} bx r0 @@ -486972,7 +486973,7 @@ sub_810AA2C: ; 810AA2C adds r3, r4, 0 adds r3, 0x43 ldrb r3, [r3] - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r3, =0x02020630 @@ -487135,7 +487136,7 @@ sub_810AB78: ; 810AB78 movs r3, 0x26 ldrsh r2, [r5, r3] movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -487253,7 +487254,7 @@ sub_810AC8C: ; 810AC8C subs r1, 0x1 strh r1, [r0, 0x16] adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0810ACB4: pop {r4} pop {r0} @@ -487266,7 +487267,7 @@ sub_810ACC0: ; 810ACC0 push {r4,lr} adds r4, r0, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =sub_810AC8C str r0, [r4, 0x1C] pop {r4} @@ -487844,7 +487845,7 @@ sub_810B154: ; 810B154 movs r3, 0x12 ldrsh r2, [r4, r3] movs r3, 0x23 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -487948,7 +487949,7 @@ sub_810B1F0: ; 810B1F0 lsrs r0, 27 bl rotscale_free_entry adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0810B230: pop {r4} pop {r0} @@ -488216,7 +488217,7 @@ sub_810B430: ; 810B430 movs r3, 0x16 ldrsh r2, [r4, r3] movs r3, 0x23 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -488350,7 +488351,7 @@ sub_810B51C: ; 810B51C subs r0, 0x1 strh r0, [r1] adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0810B552: pop {r4} pop {r0} @@ -488468,7 +488469,7 @@ sub_810B614: ; 810B614 ldrh r3, [r4, 0x20] lsls r3, 24 lsrs r3, 24 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -488537,7 +488538,7 @@ sub_810B684: ; 810B684 subs r0, 0x1 strh r0, [r1] adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0810B6B8: pop {r4} pop {r0} @@ -490738,7 +490739,7 @@ sub_810C6D4: ; 810C6D4 strb r0, [r4, 0x1] @0810C8FE: adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, =0x020383fe ldrb r0, [r1] subs r0, 0x1 @@ -490998,7 +490999,7 @@ sub_810C9E4: ; 810C9E4 movs r2, 0x8 negs r2, r2 movs r3, 0x12 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 @@ -491079,7 +491080,7 @@ sub_810CB58: ; 810CB58 adds r3, r4, 0 adds r3, 0x43 ldrb r3, [r3] - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] @@ -491118,7 +491119,7 @@ sub_810CB58: ; 810CB58 lsrs r0, 27 bl rotscale_free_entry adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles b @0810CC32 .pool @0810CC04: @@ -491142,7 +491143,7 @@ sub_810CB58: ; 810CB58 lsrs r0, 27 bl rotscale_free_entry adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0810CC32: pop {r4} pop {r0} @@ -491181,7 +491182,7 @@ sub_810CC3C: ; 810CC3C lsrs r0, 27 bl rotscale_free_entry adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0810CC7C: pop {r4} pop {r0} @@ -491264,7 +491265,7 @@ sub_810CD1C: ; 810CD1C beq @0810CD3E adds r0, r4, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] ldr r1, =move_anim_8072740 @@ -491441,7 +491442,7 @@ sub_810CE68: ; 810CE68 ldr r4, =0x0203841e ldrb r1, [r4, 0xC] adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0 strh r0, [r4, 0xC] adds r0, r5, 0 @@ -491482,7 +491483,7 @@ sub_810CEE0: ; 810CEE0 adds r5, r0, 0 ldr r4, =0x0203841e ldrb r1, [r4, 0x8] - bl obj_anim_image_start + bl StartObjectImageAnim movs r1, 0x6 ldrsh r0, [r4, r1] cmp r0, 0 @@ -491546,7 +491547,7 @@ sub_810CF30: ; 810CF30 @0810CF74: ldrb r1, [r4, 0x4] adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim mov r0, r8 movs r1, 0x2 bl sub_80A5C6C @@ -491651,7 +491652,7 @@ sub_810CF30: ; 810CF30 adds r3, 0x1 lsls r3, 24 lsrs r3, 24 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x3C] @@ -491716,7 +491717,7 @@ sub_810D0B8: ; 810D0B8 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0810D0F4: adds r0, r5, 0 bl move_anim_8072740 @@ -491919,7 +491920,7 @@ sub_810D278: ; 810D278 ldr r5, =0x0203841e ldrb r1, [r5, 0x4] adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r0, [r5, 0x6] strh r0, [r4, 0x2E] ldr r0, =sub_80A64B0 @@ -492821,7 +492822,7 @@ sub_810D984: ; 810D984 lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r0, [r5, 0x32] strh r0, [r5, 0x24] ldrh r0, [r5, 0x34] @@ -492859,7 +492860,7 @@ sub_810DA10: ; 810DA10 beq @0810DA48 adds r0, r4, 0 movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim b @0810DA5E @0810DA48: ldr r0, =0x02038436 @@ -492870,7 +492871,7 @@ sub_810DA10: ; 810DA10 beq @0810DA5E adds r0, r4, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim @0810DA5E: ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] @@ -493042,7 +493043,7 @@ sub_810DBAC: ; 810DBAC bne @0810DBC2 adds r0, r5, 0 movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim @0810DBC2: adds r0, r5, 0 movs r1, 0x1 @@ -493102,7 +493103,7 @@ sub_810DC2C: ; 810DC2C bne @0810DC44 adds r0, r4, 0 movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim @0810DC44: adds r0, r4, 0 movs r1, 0x1 @@ -493436,7 +493437,7 @@ sub_810DED8: ; 810DED8 ldrh r0, [r1] strh r0, [r4, 0xA] ldr r0, =0x00002719 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0xC] @@ -493690,7 +493691,7 @@ sub_810E044: ; 810E044 bl oamt_set_x3A_32 ldrb r1, [r4, 0xA] adds r0, r5, 0 - bl obj_anim_image_seek + bl SeekObjectImageAnim pop {r4,r5} pop {r0} bx r0 @@ -493916,7 +493917,7 @@ sub_810E2C8: ; 810E2C8 strb r0, [r4, 0x1] @0810E2FA: adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, =0x020383fe ldrb r0, [r1] subs r0, 0x1 @@ -494975,7 +494976,7 @@ sub_810EAA0: ; 810EAA0 ldr r4, =0x0203841e ldrb r1, [r4, 0x8] adds r0, r5, 0 - bl obj_anim_image_seek + bl SeekObjectImageAnim ldrh r0, [r5, 0x20] subs r0, 0x20 strh r0, [r5, 0x20] @@ -495021,7 +495022,7 @@ sub_810EB40: ; 810EB40 strh r1, [r4, 0x2E] strh r1, [r4, 0x24] adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @0810EB6A: ldrh r0, [r4, 0x3C] subs r0, 0x1 @@ -495097,7 +495098,7 @@ sub_810EB88: ; 810EB88 mov r0, r8 adds r1, r4, 0 movs r3, 0x3 - bl obj_add_from_template_call_callback_once + bl AddObjectAndAnimateForOneFrame @0810EC02: ldrh r0, [r7, 0x8] adds r0, 0x8 @@ -496001,7 +496002,7 @@ sub_810F1EC: ; 810F1EC strh r0, [r5, 0x22] ldr r0, =0x0203841e ldrh r0, [r0, 0x4] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 20 movs r1, 0x80 @@ -496432,7 +496433,7 @@ sub_810F634: ; 810F634 beq @0810F684 adds r0, r5, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r0, [r5, 0x20] subs r0, 0x28 strh r0, [r5, 0x20] @@ -496895,7 +496896,7 @@ sub_810F9D4: ; 810F9D4 movs r3, 0x24 ldrsh r2, [r4, r3] movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 movs r0, 0xC @@ -497026,7 +497027,7 @@ sub_810F9D4: ; 810F9D4 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0810FB2C: adds r0, r5, 0x1 lsls r0, 16 @@ -497294,7 +497295,7 @@ sub_810FD3C: ; 810FD3C movs r3, 0x20 ldrsh r2, [r5, r3] movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -497361,7 +497362,7 @@ sub_810FDF0: ; 810FDF0 lsrs r0, 27 bl rotscale_free_entry adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0810FE0E: pop {r4} pop {r0} @@ -497732,7 +497733,7 @@ sub_8110034: ; 8110034 lsls r3, 30 lsrs r3, 30 adds r0, r4, 0 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft ldr r1, =0x0203841e ldrb r0, [r1] bl obj_id_for_side_relative_to_move @@ -498843,9 +498844,9 @@ sub_81109F0: ; 81109F0 strh r0, [r5, 0x22] ldrb r1, [r6, 0x2] adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r5, 0 - bl obj_anim_step + bl AnimateObject strh r4, [r5, 0x2E] strh r4, [r5, 0x30] movs r0, 0x4 @@ -498905,9 +498906,9 @@ sub_8110AB4: ; 8110AB4 adds r5, r0, 0 ldr r4, =0x0203841e ldrb r1, [r4, 0xA] - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r5, 0 - bl obj_anim_step + bl AnimateObject ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner @@ -499355,7 +499356,7 @@ sub_8110E4C: ; 8110E4C strh r0, [r5, 0x22] ldr r1, =gUnknown_08596BC0 adds r0, r5, 0 - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable ldrh r0, [r4, 0x2] strh r0, [r5, 0x30] ldrh r0, [r4, 0x4] @@ -499427,7 +499428,7 @@ sub_8110F30: ; 8110F30 adds r4, r0, 0 ldr r5, =0x0203841e ldrb r1, [r5, 0x8] - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r4, 0 movs r1, 0 bl sub_80A69CC @@ -499839,7 +499840,7 @@ sub_8111214: ; 8111214 asrs r2, 16 adds r0, r3, 0 movs r3, 0x23 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -499923,7 +499924,7 @@ sub_811131C: ; 811131C strh r0, [r1, 0x1E] @08111348: adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0811134E: pop {r4} pop {r0} @@ -499963,7 +499964,7 @@ sub_8111388: ; 8111388 adds r4, r0, 0 ldr r5, =0x0203841e ldrb r1, [r5, 0x8] - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r0, [r5] strh r0, [r4, 0x24] ldrh r0, [r5, 0x2] @@ -500086,7 +500087,7 @@ sub_8111444: ; 8111444 strh r0, [r4, 0x38] ldrb r1, [r2, 0x6] adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =sub_811149C str r0, [r4, 0x1C] pop {r4,r5} @@ -501381,7 +501382,7 @@ sub_8111E78: ; 8111E78 @08111ED0: ldr r7, =0x00002771 adds r0, r7, 0 - bl gpu_pal_alloc_new + bl AllocObjectPalette lsls r0, 24 lsrs r0, 24 movs r2, 0 @@ -501398,7 +501399,7 @@ sub_8111E78: ; 8111E78 cmp r0, 0 bge @08111F0C adds r0, r7, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag @08111EFE: adds r0, r4, 0 bl move_anim_task_del @@ -501778,7 +501779,7 @@ sub_8112170: ; 8112170 adds r0, r3 bl obj_delete_but_dont_free_vram ldr r0, =0x00002771 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag movs r0, 0x50 movs r1, 0 bl SetGpuReg @@ -502057,7 +502058,7 @@ sub_81123C4: ; 81123C4 adds r1, r6, 0 adds r2, r7, 0 movs r3, 0x37 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 mov r8, r0 @@ -502148,7 +502149,7 @@ sub_81123C4: ; 81123C4 adds r1, r7, 0 ldr r2, [sp, 0xC] movs r3, 0x37 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 mov r8, r0 @@ -502378,7 +502379,7 @@ sub_81125E0: ; 81125E0 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 @@ -503122,7 +503123,7 @@ sub_8112D10: ; 8112D10 ldrsh r2, [r4, r0] ldrb r3, [r4, 0x14] ldr r0, =gUnknown_08596E30 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -503377,7 +503378,7 @@ sub_8112E9C: ; 8112E9C subs r0, 0x1 strh r0, [r1, 0x16] adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08112F56: pop {r4} pop {r0} @@ -503641,7 +503642,7 @@ sub_8113100: ; 8113100 strh r0, [r5, 0x36] adds r0, r5, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim @0811318E: ldr r0, =0x0203841e ldrh r0, [r0, 0x8] @@ -505970,7 +505971,7 @@ sub_81144BC: ; 81144BC strh r0, [r4, 0x22] ldrb r1, [r1, 0x4] adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] ldr r1, =move_anim_8072740 @@ -506279,7 +506280,7 @@ sub_8114748: ; 8114748 adds r0, r1 lsls r0, 2 adds r0, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles mov r0, sp bl sub_80A6B30 mov r0, sp @@ -508185,7 +508186,7 @@ sub_811572C: ; 811572C strh r1, [r4, 0x36] adds r0, r4, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim @0811577A: ldr r0, =0x0203841e ldrh r0, [r0, 0x8] @@ -508890,7 +508891,7 @@ sub_8115CD0: ; 8115CD0 lsls r4, 3 adds r4, r1 ldrh r0, [r4, 0x8] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 24 adds r0, 0x10 @@ -509003,7 +509004,7 @@ sub_8115D94: ; 8115D94 ldrh r0, [r5] strh r0, [r4, 0x16] ldrh r0, [r5] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 24 adds r0, 0x10 @@ -509062,7 +509063,7 @@ sub_8115E00: ; 8115E00 .pool @08115E4C: ldrh r0, [r4, 0x16] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 24 adds r0, 0x10 @@ -509136,7 +509137,7 @@ sub_8115EB8: ; 8115EB8 lsls r0, 3 adds r0, r1 ldrh r0, [r0, 0x16] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 24 adds r0, 0x10 @@ -509292,7 +509293,7 @@ sub_8115F94: ; 8115F94 adds r0, r2 ldr r0, [r0] ldrh r0, [r0, 0x2] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 24 adds r1, r6, 0 @@ -510267,7 +510268,7 @@ sub_8116848: ; 8116848 lsrs r4, 24 ldr r0, =0x0203841e ldrh r0, [r0] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 24 adds r0, 0x10 @@ -510959,7 +510960,7 @@ sub_8116D64: ; 8116D64 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles mov r0, sp bl sub_80A6B30 mov r0, sp @@ -511623,7 +511624,7 @@ sub_81172EC: ; 81172EC lsls r0, 2 ldr r4, =0x02020630 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r1, 0xC ldrsh r0, [r5, r1] cmp r0, 0 @@ -511634,7 +511635,7 @@ sub_81172EC: ; 81172EC adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0811743A: movs r1, 0x14 ldrsh r0, [r5, r1] @@ -512562,7 +512563,7 @@ sub_8117A60: ; 8117A60 lsls r0, 2 ldr r4, =0x02020630 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r1, 0xC ldrsh r0, [r5, r1] cmp r0, 0 @@ -512573,7 +512574,7 @@ sub_8117A60: ; 8117A60 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08117C06: adds r0, r6, 0 bl move_anim_task_del @@ -514977,7 +514978,7 @@ sub_8118FBC: ; 8118FBC lsls r2, 4 mov r1, r9 movs r3, 0 - bl LoadBgTileMap + bl LoadBgTilemap add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -517335,8 +517336,8 @@ sub_811A20C: ; 811A20C sub_811A278: ; 811A278 push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r0} bx r0 @@ -517346,8 +517347,8 @@ sub_811A278: ; 811A278 sub_811A290: ; 811A290 push {lr} bl copy_pal_bg_faded_to_pal_ram - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests pop {r0} bx r0 thumb_func_end sub_811A290 @@ -517571,8 +517572,8 @@ sub_811A428: ; 811A428 @0811A468: movs r0, 0 bl SetVBlankCallback - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator bl sub_80A1A74 b @0811A4C0 @0811A47C: @@ -521223,13 +521224,13 @@ sub_811BFA4: ; 811BFA4 lsls r0, 4 adds r1, r0 movs r0, 0x3 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] movs r0, 0xC0 lsls r0, 2 adds r1, r0 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r0, =gUnknown_08597C64 bl InitWindows bl DeactivateAllTextPrinters @@ -521256,7 +521257,7 @@ sub_811BFA4: ; 811BFA4 movs r0, 0x3 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer bl sub_811D60C ldr r0, =0x0203a11c ldr r0, [r0] @@ -521267,7 +521268,7 @@ sub_811BFA4: ; 811BFA4 bl sub_811D230 bl sub_811E948 movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @0811C124 .pool @0811C090: @@ -521279,7 +521280,7 @@ sub_811BFA4: ; 811BFA4 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @0811C124 .pool @0811C0AC: @@ -523158,7 +523159,7 @@ sub_811CFCC: ; 811CFCC adds r3, r4, 0 bl sub_811D058 movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 movs r1, 0x3 bl CopyWindowToVram @@ -523263,7 +523264,7 @@ sub_811D0BC: ; 811D0BC movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r0, 0x1 movs r1, 0x1 movs r2, 0xE0 @@ -523275,9 +523276,9 @@ sub_811D0BC: ; 811D0BC movs r0, 0 bl sub_811D104 movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0xC pop {r0} bx r0 @@ -523475,7 +523476,7 @@ sub_811D230: ; 811D230 strh r0, [r1, 0x2] lsls r0, 24 lsrs r0, 24 - bl PutWindowTileMap + bl PutWindowTilemap add sp, 0x8 pop {r4-r6} pop {r0} @@ -523894,7 +523895,7 @@ sub_811D60C: ; 811D60C push {r4,lr} sub sp, 0x8 movs r0, 0x3 - bl GetBgTileMap + bl GetBgTilemap adds r4, r0, 0 bl sub_811BA68 lsls r0, 24 @@ -523935,7 +523936,7 @@ sub_811D60C: ; 811D60C adds r1, r4, 0 movs r2, 0 movs r3, 0xB - bl CopyToBgTileMapBufferRect + bl CopyToBgTilemapBufferRect b @0811D67C @0811D668: movs r0, 0x20 @@ -523946,7 +523947,7 @@ sub_811D60C: ; 811D60C adds r1, r4, 0 movs r2, 0 movs r3, 0xA - bl CopyToBgTileMapBufferRect + bl CopyToBgTilemapBufferRect @0811D67C: add sp, 0x8 pop {r4} @@ -523958,9 +523959,9 @@ sub_811D60C: ; 811D60C sub_811D684: ; 811D684 push {lr} movs r0, 0x2 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram pop {r0} bx r0 thumb_func_end sub_811D684 @@ -524536,7 +524537,7 @@ sub_811DADC: ; 811DADC movs r1, 0 movs r2, 0 movs r3, 0xA - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 cmp r4, 0x16 bls @0811DAFE b @0811DC1A @@ -524677,7 +524678,7 @@ sub_811DADC: ; 811DADC bl sub_811DC28 @0811DC1A: movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0x8 pop {r4} pop {r0} @@ -524993,14 +524994,14 @@ sub_811DE5C: ; 811DE5C sub_811DE90: ; 811DE90 push {r4,r5,lr} ldr r0, =gUnknown_08597CA0 - bl gpu_tile_obj_alloc_and_load_multiple + bl LoadObjectPics ldr r0, =gUnknown_08597CC0 - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes movs r5, 0 ldr r4, =gUnknown_08597CE8 @0811DEA2: adds r0, r4, 0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic adds r4, 0x8 adds r5, 0x1 cmp r5, 0x3 @@ -525034,7 +525035,7 @@ sub_811DEC4: ; 811DEC4 adds r2, r3 asrs r2, 16 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r1, =0x0203a11c @@ -525155,7 +525156,7 @@ sub_811DFC8: ; 811DFC8 movs r1, 0 movs r2, 0 movs r3, 0x3 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r5, =0x0203a11c @@ -525176,7 +525177,7 @@ sub_811DFC8: ; 811DFC8 movs r1, 0 movs r2, 0 movs r3, 0x3 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r2, [r5] @@ -525215,7 +525216,7 @@ sub_811E050: ; 811E050 lsls r4, 2 adds r0, r4 ldr r0, [r0] - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r5] adds r4, r0, r4 movs r6, 0 @@ -525224,7 +525225,7 @@ sub_811E050: ; 811E050 lsls r4, 2 adds r0, r4 ldr r0, [r0] - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r5] adds r0, r4 str r6, [r0] @@ -525305,7 +525306,7 @@ sub_811E0EC: ; 811E0EC adds r0, r4 ldr r0, [r0] movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim mov r2, r8 ldr r1, [r2] adds r4, r1, r4 @@ -525324,7 +525325,7 @@ sub_811E0EC: ; 811E0EC adds r1, r6 ldr r0, [r1] movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim mov r1, r8 ldr r0, [r1] adds r0, r6 @@ -525340,7 +525341,7 @@ sub_811E0EC: ; 811E0EC adds r0, r4 ldr r0, [r0] movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r1, [r6] adds r4, r1, r4 ldr r0, [r4] @@ -525358,7 +525359,7 @@ sub_811E0EC: ; 811E0EC adds r1, r5 ldr r0, [r1] movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, [r6] adds r0, r5 ldr r1, [r0] @@ -525423,7 +525424,7 @@ sub_811E1A4: ; 811E1A4 adds r0, r4 ldr r0, [r0] adds r1, r6, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r1, [r5] adds r4, r1, r4 ldr r0, [r4] @@ -525436,7 +525437,7 @@ sub_811E1A4: ; 811E1A4 adds r1, r4 ldr r0, [r1] adds r1, r6, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, [r5] adds r0, r4 ldr r1, [r0] @@ -525454,7 +525455,7 @@ sub_811E1A4: ; 811E1A4 adds r0, r4 ldr r0, [r0] movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r1, [r6] adds r4, r1, r4 ldr r0, [r4] @@ -525472,7 +525473,7 @@ sub_811E1A4: ; 811E1A4 adds r1, r5 ldr r0, [r1] movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, [r6] adds r0, r5 ldr r1, [r0] @@ -525496,7 +525497,7 @@ sub_811E288: ; 811E288 movs r1, 0 movs r2, 0 movs r3, 0x4 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r1, =0x0203a11c @@ -525626,7 +525627,7 @@ sub_811E380: ; 811E380 ldr r0, [r0] cmp r0, 0 beq @0811E3A2 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r4] movs r1, 0xB9 lsls r1, 2 @@ -525647,7 +525648,7 @@ sub_811E3AC: ; 811E3AC movs r1, 0xD0 movs r2, 0x80 movs r3, 0x6 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r5, =0x0203a11c @@ -525668,7 +525669,7 @@ sub_811E3AC: ; 811E3AC movs r1, 0xD0 movs r2, 0x50 movs r3, 0x5 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r2, [r5] @@ -525724,7 +525725,7 @@ sub_811E418: ; 811E418 adds r0, r1 ldr r0, [r0] movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim b @0811E476 @0811E466: ldr r0, [r4] @@ -525733,7 +525734,7 @@ sub_811E418: ; 811E418 adds r0, r1 ldr r0, [r0] movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim @0811E476: ldr r0, =0x0203a11c ldr r1, [r0] @@ -525778,7 +525779,7 @@ sub_811E4AC: ; 811E4AC adds r0, r1 ldr r0, [r0] movs r1, 0x3 - bl obj_anim_image_start + bl StartObjectImageAnim pop {r0} bx r0 .pool @@ -525831,13 +525832,13 @@ sub_811E4D0: ; 811E4D0 lsls r4, 2 adds r0, r3, r4 ldr r0, [r0] - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r5] movs r1, 0xBA lsls r1, 2 adds r0, r1 ldr r0, [r0] - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, [r5] adds r4, r1, r4 str r6, [r4] @@ -525868,7 +525869,7 @@ sub_811E55C: ; 811E55C adds r0, r1 ldr r0, [r0] movs r1, 0x4 - bl obj_anim_image_start + bl StartObjectImageAnim pop {r0} bx r0 .pool @@ -525888,7 +525889,7 @@ sub_811E578: ; 811E578 adds r0, r1 ldr r0, [r0] movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim b @0811E5AE .pool @0811E59C: @@ -525899,7 +525900,7 @@ sub_811E578: ; 811E578 adds r0, r1 ldr r0, [r0] movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim @0811E5AE: pop {r0} bx r0 @@ -525931,7 +525932,7 @@ sub_811E5D4: ; 811E5D4 movs r1, 0x60 movs r2, 0x50 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -525952,7 +525953,7 @@ sub_811E5D4: ; 811E5D4 movs r1, 0x60 movs r2, 0x9C movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -526102,7 +526103,7 @@ sub_811E720: ; 811E720 movs r1, 0xDC movs r2, 0x54 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -526123,7 +526124,7 @@ sub_811E720: ; 811E720 movs r1, 0xDC movs r2, 0x9C movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -526140,7 +526141,7 @@ sub_811E720: ; 811E720 adds r0, r1 str r0, [r2] movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim @0811E77E: bl sub_811E7F8 pop {r4} @@ -526283,7 +526284,7 @@ sub_811E828: ; 811E828 ands r1, r2 strb r1, [r0, 0x5] movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim @0811E892: ldr r0, =0x03005d90 ldr r0, [r0] @@ -526314,7 +526315,7 @@ sub_811E828: ; 811E828 ands r1, r2 strb r1, [r0, 0x5] movs r1, 0x3 - bl obj_anim_image_start + bl StartObjectImageAnim @0811E8D0: add sp, 0x4 pop {r4,r5} @@ -526471,7 +526472,7 @@ sub_811E948: ; 811E948 cmp r6, 0x3 ble @0811E9C6 lsrs r0, r4, 24 - bl PutWindowTileMap + bl PutWindowTilemap @0811E9FA: add sp, 0x14 pop {r3-r5} @@ -528711,13 +528712,13 @@ sub_811FAF8: ; 811FAF8 adds r0, r5, r0 lsls r0, 16 lsrs r0, 16 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag ldr r0, [r4] ldrh r0, [r0, 0x2] adds r0, r5, r0 lsls r0, 16 lsrs r0, 16 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 @@ -528733,7 +528734,7 @@ sub_811FAF8: ; 811FAF8 ldr r0, [r0] cmp r0, 0 beq @0811FB9A - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r6] adds r0, 0xC adds r0, r4 @@ -528754,7 +528755,7 @@ sub_811FAF8: ; 811FAF8 ldr r0, [r0] cmp r0, 0 beq @0811FB9A - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r6] adds r0, 0x14 adds r0, r4 @@ -528770,7 +528771,7 @@ sub_811FAF8: ; 811FAF8 ldr r0, [r0, 0x24] cmp r0, 0 beq @0811FB8A - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r4] str r7, [r0, 0x24] @0811FB8A: @@ -528778,7 +528779,7 @@ sub_811FAF8: ; 811FAF8 ldr r0, [r0, 0x28] cmp r0, 0 beq @0811FB9A - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r4] str r7, [r0, 0x28] @0811FB9A: @@ -528982,9 +528983,9 @@ sub_811FC80: ; 811FC80 ldr r0, =nullsub_47 str r0, [r4, 0x14] mov r0, sp - bl gpu_tile_obj_alloc_and_load_multiple + bl LoadObjectPics mov r0, r10 - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes movs r5, 0 mov r3, r8 lsls r3, 16 @@ -529009,7 +529010,7 @@ sub_811FC80: ; 811FC80 asrs r1, r2, 16 asrs r2, r7, 16 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 @@ -529029,7 +529030,7 @@ sub_811FC80: ; 811FC80 str r0, [r2] lsls r1, r5, 24 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 @@ -529072,7 +529073,7 @@ sub_811FC80: ; 811FC80 mov r3, r9 asrs r1, r3, 16 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 @@ -529102,7 +529103,7 @@ sub_811FC80: ; 811FC80 movs r1, 0 movs r2, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 @@ -529128,7 +529129,7 @@ sub_811FC80: ; 811FC80 ldr r0, [r6] ldr r0, [r0, 0x28] movs r1, 0x9 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r1, [r6] ldr r2, [r1, 0x28] ldr r3, [sp, 0x48] @@ -529143,7 +529144,7 @@ sub_811FC80: ; 811FC80 movs r1, 0x1 movs r2, 0x2 movs r3, 0 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft b @0811FEAE .pool @0811FEA8: @@ -529161,7 +529162,7 @@ sub_811FC80: ; 811FC80 adds r0, r4, 0 movs r2, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 @@ -529180,7 +529181,7 @@ sub_811FC80: ; 811FC80 strh r0, [r1, 0x2E] ldr r0, [r2, 0x24] movs r1, 0x8 - bl obj_anim_image_start + bl StartObjectImageAnim b @0811FF28 .pool @0811FEFC: @@ -529241,14 +529242,14 @@ sub_811FF40: ; 811FF40 lsls r1, 24 lsrs r1, 24 adds r0, r2, 0 - bl obj_anim_image_start + bl StartObjectImageAnim b @0811FF76 .pool @0811FF6C: lsls r1, 25 lsrs r1, 24 adds r0, r2, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @0811FF76: pop {r0} bx r0 @@ -529351,14 +529352,14 @@ sub_811FFD4: ; 811FFD4 orrs r0, r3 str r0, [r5, 0x4] adds r0, r5, 0 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic adds r0, r4, 0 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette mov r0, sp movs r1, 0 movs r2, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -532130,10 +532131,10 @@ sub_81215EC: ; 81215EC bl clear_tasks b @081219D4 @08121694: - bl reset_all_obj_data + bl ResetAllObjectData b @081219D4 @0812169A: - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator bl reset_temp_tile_data_buffers movs r0, 0x10 movs r1, 0 @@ -532180,12 +532181,12 @@ sub_81215EC: ; 81215EC lsls r2, 2 adds r1, r2 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x0000122c adds r1, r0 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap b @081219D4 .pool @08121730: @@ -532232,14 +532233,14 @@ sub_81215EC: ; 81215EC movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r5, [sp] str r4, [sp, 0x4] movs r0, 0x2 movs r1, 0x1 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 ldr r2, =gUnknown_0859F2B8 ldr r0, =0x0203a134 ldr r0, [r0] @@ -532255,16 +532256,16 @@ sub_81215EC: ; 81215EC movs r0, 0x1 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer b @081219D4 .pool @081217D8: movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @081219D4 @081217EC: bl sub_8098C64 @@ -532650,9 +532651,9 @@ sub_8121B1C: ; 8121B1C sub sp, 0x2C movs r7, 0 movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 movs r1, 0 bl FillWindowPixelBuffer @@ -532786,8 +532787,8 @@ sub_8121B1C: ; 8121B1C thumb_func_start sub_8121C50 sub_8121C50: ; 8121C50 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -532803,8 +532804,8 @@ sub_8121C64: ; 8121C64 ldrb r0, [r0] cmp r0, 0 beq @08121C7C - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad @08121C7C: ldr r0, [r4] movs r1, 0x84 @@ -532918,9 +532919,9 @@ sub_8121D00: ; 8121D00 bl memset bl sub_80A1A74 movs r0, 0 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0x1 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0 bl ResetBgsAndClearDma3BusyFlags bl FreeAllWindowBuffers @@ -533680,9 +533681,9 @@ sub_8122298: ; 8122298 sub_8122328: ; 8122328 push {lr} ldr r0, =gUnknown_0859F514 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_0859F51C - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette pop {r0} bx r0 .pool @@ -533705,7 +533706,7 @@ sub_8122344: ; 8122344 ldr r0, =gUnknown_0859F524 movs r2, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront mov r1, r8 adds r4, r1, r5 strb r0, [r4] @@ -533717,7 +533718,7 @@ sub_8122344: ; 8122344 lsls r0, 2 adds r0, r7 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim @0812237E: ldrb r1, [r4] lsls r0, r1, 4 @@ -533763,7 +533764,7 @@ sub_81223B0: ; 81223B0 adds r0, r1 lsls r0, 2 adds r0, r7 - bl obj_delete_and_free_resources + bl RemoveObjectAndFreeResources b @081223EC .pool @081223DC: @@ -533773,7 +533774,7 @@ sub_81223B0: ; 81223B0 adds r0, r1 lsls r0, 2 adds r0, r7 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @081223EC: adds r0, r4, 0x1 lsls r0, 24 @@ -535369,29 +535370,29 @@ sub_812305C: ; 812305C ldr r0, [r0, 0x1C] cmp r0, 0 beq @08123080 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r4] adds r0, 0x58 ldrh r0, [r0] - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag ldr r0, [r4] adds r0, 0x5A ldrh r0, [r0] - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag @08123080: ldr r0, [r4] ldr r0, [r0, 0x20] cmp r0, 0 beq @081230A0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r4] adds r0, 0x70 ldrh r0, [r0] - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag ldr r0, [r4] adds r0, 0x72 ldrh r0, [r0] - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag @081230A0: pop {r4} pop {r0} @@ -537582,14 +537583,14 @@ sub_81240D4: ; 81240D4 @0812416E: str r0, [sp, 0x14] adds r0, r2, 0 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic adds r0, r7, 0 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette mov r0, sp movs r1, 0x38 movs r2, 0x48 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -537623,7 +537624,7 @@ sub_81240D4: ; 81240D4 strh r0, [r1, 0x22] ldr r0, [r2, 0x1C] movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim b @08124204 .pool @081241DC: @@ -537654,7 +537655,7 @@ sub_81240D4: ; 81240D4 movs r0, 0x2 strh r0, [r1, 0x30] adds r0, r6, 0 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag ldr r1, [r4] ldr r2, [r1, 0x1C] lsls r0, 24 @@ -537681,15 +537682,15 @@ sub_8124238: ; 8124238 ldr r0, [r0, 0x1C] cmp r0, 0 beq @0812425C - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r4] adds r0, 0x58 ldrh r0, [r0] - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag ldr r0, [r4] adds r0, 0x5A ldrh r0, [r0] - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag @0812425C: pop {r4} pop {r0} @@ -537776,14 +537777,14 @@ sub_8124288: ; 8124288 str r0, [sp, 0x20] @08124316: adds r0, r6, 0 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic adds r0, r4, 0 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette mov r0, sp movs r1, 0 movs r2, 0 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r1, =0x0203a144 @@ -538320,9 +538321,9 @@ sub_8124690: ; 8124690 .pool @08124754: bl sub_80A1A74 - bl reset_all_obj_data - bl gpu_tile_obj_tags_reset - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl FreeAllObjectTiles + bl ResetObjectPaletteAllocator b @0812489C @08124766: movs r0, 0 @@ -538390,7 +538391,7 @@ sub_8124690: ; 8124690 movs r2, 0x20 bl gpu_pal_apply movs r0, 0x2 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x2 movs r1, 0 bl FillWindowPixelBuffer @@ -538458,8 +538459,8 @@ sub_8124690: ; 8124690 thumb_func_start sub_81248C0 sub_81248C0: ; 81248C0 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -538472,8 +538473,8 @@ sub_81248D4: ; 81248D4 ldr r0, [r0] ldr r0, [r0] bl _call_via_r0 - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl do_scheduled_bg_tilemap_copies_to_vram pop {r0} bx r0 @@ -538681,9 +538682,9 @@ sub_8124A70: ; 8124A70 orrs r0, r1 str r0, [sp, 0x4] mov r0, sp - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, =gUnknown_085A1F10 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette bl sub_8124AD4 bl sub_8124BE4 add sp, 0x8 @@ -538760,7 +538761,7 @@ sub_8124AD4: ; 8124AD4 ldrsh r2, [r3, r0] ldr r0, =gUnknown_085A1F7C movs r3, 0xA - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 @@ -538801,7 +538802,7 @@ sub_8124AD4: ; 8124AD4 lsls r1, r7, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim mov r2, r9 strh r2, [r4, 0x2E] @08124BB8: @@ -538884,7 +538885,7 @@ sub_8124BE4: ; 8124BE4 ldrsh r2, [r5, r0] ldr r0, =gUnknown_085A1F7C movs r3, 0xA - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -538905,7 +538906,7 @@ sub_8124BE4: ; 8124BE4 str r0, [r2] adds r0, r4, 0 movs r1, 0x6 - bl obj_anim_image_start + bl StartObjectImageAnim strh r6, [r4, 0x2E] @08124C84: mov r0, r8 @@ -542666,7 +542667,7 @@ sub_8126A58: ; 8126A58 movs r1, 0 bl sub_8198070 ldrb r0, [r4] - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r4] bl RemoveWindow movs r0, 0 @@ -545483,7 +545484,7 @@ sub_81281A8: ; 81281A8 adds r0, r1 lsls r0, 2 adds r0, r3 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, =0x03005dd0 ldr r0, [r0, 0x4] strb r0, [r4] @@ -546693,7 +546694,7 @@ c1_overworld_prev_quest: ; 8128BEC @08128C30: bl sub_812A3C8 ldr r0, =0x00000be5 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag ldr r1, =0x03005dac ldr r0, =sub_8128CD4 str r0, [r1] @@ -547623,7 +547624,7 @@ gpu_pal_decompress_alloc_tag_and_upload: ; 8129334 cmp r0, 0x4 beq @081293B4 ldr r0, =0x00000be5 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag adds r0, r5, 0 bl sub_81291E8 ldr r0, [r5] @@ -547645,12 +547646,12 @@ gpu_pal_decompress_alloc_tag_and_upload: ; 8129334 lsrs r1, 12 bl sub_8129068 ldr r0, =gUnknown_085A72BC - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette ldr r0, =gUnknown_085A728C movs r1, 0 movs r2, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront b @081293C6 .pool @081293B4: @@ -547691,7 +547692,7 @@ sub_81293D8: ; 81293D8 bl sub_812949C ldr r4, =0x0203cebc ldr r1, [r4] - bl call_LZZUnCompWram + bl LZDecompressWram ldr r0, [r4] ldr r4, =0x0203cec0 ldr r1, [r4] @@ -547710,7 +547711,7 @@ sub_81293D8: ; 81293D8 orrs r0, r2 str r0, [sp, 0x4] mov r0, sp - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic adds r0, r5, 0 movs r1, 0x1 bl sub_812949C @@ -547720,7 +547721,7 @@ sub_81293D8: ; 81293D8 ands r1, r4 orrs r1, r6 str r1, [r0, 0x4] - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette movs r0, 0x18 bl Alloc adds r5, r0, 0 @@ -547736,7 +547737,7 @@ sub_81293D8: ; 81293D8 movs r1, 0 movs r2, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -547839,14 +547840,14 @@ sub_81294C0: ; 81294C0 orrs r0, r1 str r0, [sp, 0x8] add r0, sp, 0x4 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic str r5, [sp, 0xC] add r0, sp, 0xC ldr r1, [r0, 0x4] ands r1, r4 orrs r1, r7 str r1, [r0, 0x4] - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette movs r0, 0x18 bl Alloc adds r4, r0, 0 @@ -547863,7 +547864,7 @@ sub_81294C0: ; 81294C0 movs r1, 0 movs r2, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r5, r0, 24 adds r0, r4, 0 @@ -548422,7 +548423,7 @@ sub_81299DC: ; 81299DC movs r1, 0x78 movs r2, 0x50 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 str r0, [r4, 0x4] @@ -548470,7 +548471,7 @@ sub_81299DC: ; 81299DC adds r0, r1 lsls r0, 2 adds r0, r6 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, =0x03005dd0 ldr r0, [r0, 0x4] strb r0, [r5] @@ -549585,12 +549586,12 @@ sub_812A39C: ; 812A39C cmp r0, 0 bne @0812A3B8 ldr r0, =gUnknown_085A73D8 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette b @0812A3BE .pool @0812A3B8: ldr r0, =gUnknown_085A73E0 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette @0812A3BE: pop {r0} bx r0 @@ -549601,7 +549602,7 @@ sub_812A39C: ; 812A39C sub_812A3C8: ; 812A3C8 push {lr} movs r0, 0x8 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag pop {r0} bx r0 thumb_func_end sub_812A3C8 @@ -549891,8 +549892,8 @@ sub_812A588: ; 812A588 sub_812A670: ; 812A670 push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r0} bx r0 @@ -549901,8 +549902,8 @@ sub_812A670: ; 812A670 thumb_func_start sub_812A688 sub_812A688: ; 812A688 push {r4,lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram ldr r4, =0x0203ab34 ldr r0, [r4] @@ -550269,11 +550270,11 @@ sub_812A8C4: ; 812A8C4 sub_812A9AC: ; 812A9AC push {lr} bl sub_80A1A74 - bl reset_all_obj_data + bl ResetAllObjectData ldr r1, =0x02021b38 movs r0, 0x80 strb r0, [r1] - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator bl clear_tasks pop {r0} bx r0 @@ -550341,7 +550342,7 @@ sub_812AA48: ; 812AA48 movs r2, 0xE0 bl sub_809882C movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap pop {r0} bx r0 thumb_func_end sub_812AA48 @@ -555582,7 +555583,7 @@ sub_812D28C: ; 812D28C lsrs r3, 16 movs r0, 0x2 movs r2, 0x2 - bl LoadBgTileMap + bl LoadBgTilemap ldrb r0, [r4, 0xC] bl sub_812EF6C movs r0, 0 @@ -555639,7 +555640,7 @@ sub_812D30C: ; 812D30C lsrs r3, 16 movs r0, 0x2 movs r2, 0x2 - bl LoadBgTileMap + bl LoadBgTilemap ldrh r0, [r4, 0xA] subs r0, 0x1 strh r0, [r4, 0xA] @@ -555730,7 +555731,7 @@ sub_812D3B4: ; 812D3B4 lsrs r3, 16 movs r0, 0x2 movs r2, 0x2 - bl LoadBgTileMap + bl LoadBgTilemap lsls r0, r5, 16 movs r1, 0x80 lsls r1, 9 @@ -555780,7 +555781,7 @@ sub_812D3B4: ; 812D3B4 lsrs r3, 16 movs r0, 0x2 movs r2, 0x2 - bl LoadBgTileMap + bl LoadBgTilemap lsls r0, r5, 16 movs r1, 0x80 lsls r1, 9 @@ -556055,7 +556056,7 @@ sub_812D63C: ; 812D63C mov r2, sp adds r1, r2, r5 ldrb r1, [r1] - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent movs r1, 0x10 ldrsh r0, [r7, r1] movs r1, 0x80 @@ -556110,7 +556111,7 @@ sub_812D6EC: ; 812D6EC ldr r1, =0x02020630 adds r0, r1 movs r1, 0x3 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent @0812D730: pop {r4} pop {r0} @@ -556311,7 +556312,7 @@ sub_812D870: ; 812D870 ldr r1, =0x02020630 adds r0, r1 movs r1, 0x5 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent ldr r0, =0x00000187 bl fanfare_play b @0812D914 @@ -556328,7 +556329,7 @@ sub_812D870: ; 812D870 ldr r4, =0x02020630 adds r0, r4 movs r1, 0x4 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent ldr r0, [r5] adds r0, 0x3F ldrb r1, [r0] @@ -556570,7 +556571,7 @@ sub_812DA90: ; 812DA90 lsls r0, 2 adds r0, r5 movs r1, 0x5 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent ldrh r0, [r4, 0x8] adds r0, 0x1 movs r1, 0 @@ -556732,7 +556733,7 @@ sub_812DC08: ; 812DC08 lsrs r3, 16 movs r0, 0x1 movs r2, 0x2 - bl LoadBgTileMap + bl LoadBgTilemap adds r4, 0x1 lsls r4, 16 lsrs r2, r4, 16 @@ -556759,7 +556760,7 @@ sub_812DC50: ; 812DC50 movs r0, 0x1 ldr r1, =gUnknown_085A9898 movs r2, 0x2 - bl LoadBgTileMap + bl LoadBgTilemap adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -556887,7 +556888,7 @@ sub_812DD48: ; 812DD48 ldr r0, =gUnknown_085A7444 bl AddWindow movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x1 movs r1, 0 bl FillWindowPixelBuffer @@ -556951,7 +556952,7 @@ sub_812DDC4: ; 812DDC4 movs r1, 0 bl FillWindowPixelBuffer movs r0, 0x1 - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0x1 movs r1, 0x1 bl CopyWindowToVram @@ -557245,7 +557246,7 @@ sub_812DFDC: ; 812DFDC lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0x40 strh r0, [r4] @0812E02E: @@ -557349,7 +557350,7 @@ sub_812E0E4: ; 812E0E4 asrs r1, r5, 16 movs r2, 0 movs r3, 0xE - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -557434,7 +557435,7 @@ sub_812E154: ; 812E154 bl sub_812BC44 lsls r0, 24 lsrs r0, 24 - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag adds r1, r5, 0 adds r1, 0x40 strh r0, [r1] @@ -557524,7 +557525,7 @@ sub_812E230: ; 812E230 adds r1, r5, 0 adds r2, r6, 0 movs r3, 0xD - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r2, r0, 4 @@ -557590,7 +557591,7 @@ sub_812E2A8: ; 812E2A8 adds r0, r3 lsrs r2, r0, 16 adds r0, r2, 0 - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag adds r1, r4, 0 adds r1, 0x40 strh r0, [r1] @@ -557610,7 +557611,7 @@ sub_812E300: ; 812E300 movs r1, 0x58 movs r2, 0x48 movs r3, 0xF - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -557624,7 +557625,7 @@ sub_812E300: ; 812E300 orrs r1, r2 strb r1, [r0, 0x5] ldr r1, =gUnknown_085A7FC0 - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable pop {r0} bx r0 .pool @@ -557679,7 +557680,7 @@ sub_812E33C: ; 812E33C mov r0, sp movs r2, 0x50 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r1, =0x02020630 @@ -557722,7 +557723,7 @@ sub_812E3E8: ; 812E3E8 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r4, =0x0203aae4 ldr r0, [r4] cmp r0, 0 @@ -557821,7 +557822,7 @@ sub_812E474: ; 812E474 lsls r1, 1 movs r2, 0x34 movs r3, 0x7 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r4, r0, 24 lsls r0, r4, 4 @@ -557847,7 +557848,7 @@ sub_812E474: ; 812E474 strb r0, [r1] ldr r1, =gUnknown_085A7FE0 adds r0, r2, 0 - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable ldr r5, =0x0203ab34 ldr r0, [r5] adds r0, 0x49 @@ -557882,7 +557883,7 @@ sub_812E474: ; 812E474 lsls r1, 1 movs r2, 0x54 movs r3, 0x7 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r4, r0, 24 lsls r0, r4, 4 @@ -557903,7 +557904,7 @@ sub_812E474: ; 812E474 strb r0, [r1] ldr r1, =gUnknown_085A7FF4 adds r0, r2, 0 - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable ldr r0, [r5] adds r0, 0x4A strb r4, [r0] @@ -557956,7 +557957,7 @@ sub_812E5A8: ; 812E5A8 mov r0, sp movs r2, 0x50 movs r3, 0x7 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -557979,7 +557980,7 @@ sub_812E5A8: ; 812E5A8 orrs r1, r2 strb r1, [r3] ldr r1, =gUnknown_085A8010 - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x42 @@ -558002,7 +558003,7 @@ sub_812E650: ; 812E650 lsls r1, 1 movs r2, 0 movs r3, 0xA - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r3, r0, 4 @@ -558075,7 +558076,7 @@ sub_812E6C4: ; 812E6C4 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent pop {r4} pop {r0} bx r0 @@ -558094,7 +558095,7 @@ sub_812E70C: ; 812E70C ldr r0, =gUnknown_085A7DA0 movs r2, 0x64 movs r3, 0x9 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -558125,7 +558126,7 @@ sub_812E70C: ; 812E70C mov r9, r0 adds r0, r2, 0 mov r1, r9 - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable ldr r6, =0x0203ab34 ldr r0, [r6] adds r0, 0x4E @@ -558135,7 +558136,7 @@ sub_812E70C: ; 812E70C ldr r0, =gUnknown_085A7DA0 movs r2, 0x68 movs r3, 0x4 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -558156,7 +558157,7 @@ sub_812E70C: ; 812E70C strb r5, [r2, 0x5] adds r0, r2, 0 mov r1, r9 - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable ldr r0, [r6] adds r0, 0x4F strb r4, [r0] @@ -558178,7 +558179,7 @@ sub_812E7CC: ; 812E7CC lsls r1, 1 movs r2, 0x4C movs r3, 0xB - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -558201,7 +558202,7 @@ sub_812E7CC: ; 812E7CC orrs r1, r2 strb r1, [r0, 0x5] ldr r1, =gUnknown_085A803C - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x40 @@ -558224,7 +558225,7 @@ sub_812E82C: ; 812E82C lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r4, 0 @0812E846: ldr r0, =0x0203ab34 @@ -558237,7 +558238,7 @@ sub_812E82C: ; 812E82C lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -558271,7 +558272,7 @@ sub_812E82C: ; 812E82C lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -558298,7 +558299,7 @@ sub_812E8C4: ; 812E8C4 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -558322,7 +558323,7 @@ sub_812E8F8: ; 812E8F8 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r4, =0x0203aaf0 ldr r0, [r4] cmp r0, 0 @@ -558349,7 +558350,7 @@ sub_812E934: ; 812E934 movs r1, 0x98 movs r2, 0x20 movs r3, 0x5 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -558391,7 +558392,7 @@ sub_812E934: ; 812E934 movs r1, 0xB8 movs r2, 0x20 movs r3, 0x5 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -558518,7 +558519,7 @@ sub_812EA7C: ; 812EA7C lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -558541,7 +558542,7 @@ sub_812EAB0: ; 812EAB0 movs r1, 0x48 movs r2, 0x50 movs r3, 0x3 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r1, =0x02020630 @@ -558574,7 +558575,7 @@ sub_812EAB0: ; 812EAB0 movs r1, 0x68 movs r2, 0x50 movs r3, 0x3 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -558622,7 +558623,7 @@ sub_812EB48: ; 812EB48 cmp r0, 0 bgt @0812EB9A movs r0, 0x7 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 4 ldr r2, =0x01030000 @@ -558670,7 +558671,7 @@ sub_812EBAC: ; 812EBAC sub_812EBCC: ; 812EBCC push {r4,lr} movs r0, 0x7 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 4 ldr r1, =0x01030000 @@ -558692,7 +558693,7 @@ sub_812EBCC: ; 812EBCC lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -558711,7 +558712,7 @@ sub_812EC20: ; 812EC20 movs r1, 0xA8 movs r2, 0x50 movs r3, 0x6 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r2, =0x02020630 @@ -558756,7 +558757,7 @@ sub_812EC70: ; 812EC70 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles pop {r0} bx r0 .pool @@ -558781,7 +558782,7 @@ sub_812EC94: ; 812EC94 ldr r0, =gUnknown_085A7E18 movs r2, 0x44 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r3, r0, 4 @@ -558898,7 +558899,7 @@ sub_812ED8C: ; 812ED8C lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -558917,7 +558918,7 @@ sub_812EDC0: ; 812EDC0 movs r1, 0xA8 movs r2, 0x3C movs r3, 0x8 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -559063,7 +559064,7 @@ sub_812EECC: ; 812EECC lsrs r0, 27 bl rotscale_free_entry adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles pop {r4} pop {r0} bx r0 @@ -559082,7 +559083,7 @@ sub_812EF00: ; 812EF00 asrs r2, 16 adds r1, r3, 0 movs r3, 0xC - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -559142,7 +559143,7 @@ sub_812EF6C: ; 812EF6C lsrs r0, 27 bl rotscale_free_entry adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles pop {r4} pop {r0} bx r0 @@ -559218,7 +559219,7 @@ sub_812EFDC: ; 812EFDC asrs r2, 16 mov r0, sp movs r3, 0x10 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 adds r7, r0, 0 @@ -559243,7 +559244,7 @@ sub_812EFDC: ; 812EFDC cmp r1, 0 beq @0812F056 adds r0, r2, 0 - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable @0812F056: adds r0, r7, 0 add sp, 0x18 @@ -559524,7 +559525,7 @@ sub_812F21C: ; 812F21C lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] @@ -559759,7 +559760,7 @@ sub_812F3B4: ; 812F3B4 strb r0, [r2] adds r0, r4, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r0, [r4, 0x30] lsls r1, r0, 4 orrs r1, r0 @@ -559808,7 +559809,7 @@ sub_812F3B4: ; 812F3B4 strb r0, [r4, 0x1] adds r0, r4, 0 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @0812F468: pop {r4} pop {r0} @@ -559828,7 +559829,7 @@ sub_812F470: ; 812F470 adds r0, r1 ldr r4, [r0] movs r0, 0x6 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag adds r1, r0, 0 lsls r1, 24 lsrs r1, 4 @@ -559861,7 +559862,7 @@ sub_812F470: ; 812F470 adds r0, r1 ldr r4, [r0] movs r0, 0x6 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag adds r1, r0, 0 lsls r1, 24 lsrs r1, 4 @@ -559885,7 +559886,7 @@ sub_812F470: ; 812F470 @0812F4FC: adds r0, r5, 0 movs r1, 0x1 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent movs r0, 0 strh r0, [r5, 0x3C] pop {r4,r5} @@ -560240,7 +560241,7 @@ sub_812F794: ; 812F794 ldr r0, =gUnknown_085A8520 ldr r4, [r0] movs r0, 0x6 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag adds r1, r0, 0 lsls r1, 24 lsrs r1, 4 @@ -560289,7 +560290,7 @@ sub_812F7E4: ; 812F7E4 adds r1, r0, 0 str r1, [r4] ldr r0, =gUnknown_08DD0050 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r4, =0x0203aad8 movs r0, 0xD8 lsls r0, 6 @@ -560297,7 +560298,7 @@ sub_812F7E4: ; 812F7E4 adds r1, r0, 0 str r1, [r4] ldr r0, =gUnknown_085A858C - bl call_LZZUnCompWram + bl LZDecompressWram ldr r4, =0x0203ab30 movs r0, 0xB0 bl AllocZeroed @@ -560347,9 +560348,9 @@ sub_812F7E4: ; 812F7E4 adds r1, r2 str r1, [r0] adds r0, r3, 0 - bl gpu_tile_obj_alloc_and_load_multiple + bl LoadObjectPics ldr r0, =gUnknown_085A8544 - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes pop {r4-r6} pop {r0} bx r0 @@ -560398,7 +560399,7 @@ sub_812F8A0: ; 812F8A0 strh r1, [r0, 0x4] movs r1, 0x11 strh r1, [r0, 0x6] - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic pop {r4-r6} pop {r0} bx r0 @@ -560416,7 +560417,7 @@ sub_812F908: ; 812F908 adds r1, r0, 0 str r1, [r4] ldr r0, =gUnknown_08DCDB30 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r1, [r4] movs r0, 0x2 adds r2, r5, 0 @@ -560453,7 +560454,7 @@ sub_812F968: ; 812F968 lsls r2, 3 movs r0, 0x2 movs r3, 0 - bl LoadBgTileMap + bl LoadBgTilemap pop {r0} bx r0 .pool @@ -560486,7 +560487,7 @@ sub_812F980: ; 812F980 lsrs r3, 16 movs r0, 0x3 movs r2, 0x2 - bl LoadBgTileMap + bl LoadBgTilemap mov r0, r8 ldr r1, [r0] adds r1, 0x2 @@ -560497,7 +560498,7 @@ sub_812F980: ; 812F980 lsrs r3, 16 movs r0, 0x3 movs r2, 0x2 - bl LoadBgTileMap + bl LoadBgTilemap mov r0, r8 ldr r1, [r0] adds r1, 0x4 @@ -560507,7 +560508,7 @@ sub_812F980: ; 812F980 lsrs r3, 16 movs r0, 0x3 movs r2, 0x2 - bl LoadBgTileMap + bl LoadBgTilemap mov r2, r8 ldr r1, [r2] adds r1, 0x6 @@ -560519,7 +560520,7 @@ sub_812F980: ; 812F980 lsrs r3, 16 movs r0, 0x3 movs r2, 0x2 - bl LoadBgTileMap + bl LoadBgTilemap adds r4, 0x1 lsls r4, 16 lsrs r0, r4, 16 @@ -560535,7 +560536,7 @@ sub_812F980: ; 812F980 lsrs r3, 16 movs r0, 0x3 movs r2, 0x2 - bl LoadBgTileMap + bl LoadBgTilemap mov r0, r8 ldr r1, [r0] adds r1, 0xA @@ -560544,7 +560545,7 @@ sub_812F980: ; 812F980 lsrs r3, 16 movs r0, 0x3 movs r2, 0x2 - bl LoadBgTileMap + bl LoadBgTilemap movs r0, 0x7 @0812FA32: mov r2, r8 @@ -560560,7 +560561,7 @@ sub_812F980: ; 812F980 lsrs r3, 16 movs r0, 0x3 movs r2, 0x2 - bl LoadBgTileMap + bl LoadBgTilemap adds r4, 0x1 lsls r4, 16 lsrs r0, r4, 16 @@ -560603,7 +560604,7 @@ sub_812FA78: ; 812FA78 movs r0, 0x2 movs r2, 0x2 adds r3, r4, 0 - bl LoadBgTileMap + bl LoadBgTilemap ldr r1, [r6] adds r1, 0x2 ldr r0, =0x000001e1 @@ -560612,7 +560613,7 @@ sub_812FA78: ; 812FA78 lsrs r3, 16 movs r0, 0x2 movs r2, 0x2 - bl LoadBgTileMap + bl LoadBgTilemap ldr r1, [r6] adds r1, 0x4 movs r0, 0x80 @@ -560622,7 +560623,7 @@ sub_812FA78: ; 812FA78 lsrs r3, 16 movs r0, 0x2 movs r2, 0x2 - bl LoadBgTileMap + bl LoadBgTilemap ldr r1, [r6] adds r1, 0x6 ldr r0, =0x00000201 @@ -560632,7 +560633,7 @@ sub_812FA78: ; 812FA78 movs r0, 0x2 movs r2, 0x2 adds r3, r5, 0 - bl LoadBgTileMap + bl LoadBgTilemap pop {r4-r6} pop {r0} bx r0 @@ -560647,7 +560648,7 @@ sub_812FAF4: ; 812FAF4 lsls r2, 3 movs r0, 0x2 movs r3, 0 - bl LoadBgTileMap + bl LoadBgTilemap movs r0, 0x3 bl HideBg pop {r0} @@ -560985,7 +560986,7 @@ sub_812FE0C: ; 812FE0C ldrb r0, [r0] bl RemoveWindow movs r0, 0x1 - bl GetBgTileMap + bl GetBgTilemap bl Free bl sub_805F094 pop {r4,r5} @@ -561070,7 +561071,7 @@ sub_812FE58: ; 812FE58 orrs r0, r7 str r0, [r1, 0x8] ldr r0, [r1, 0x8] - bl reset_all_obj_data + bl ResetAllObjectData b @0812FF36 .pool @0812FF14: @@ -561257,7 +561258,7 @@ sub_8130098: ; 8130098 bl AllocZeroed adds r1, r0, 0 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r4, =0x030011f7 ldr r0, =gUnknown_085B07EC bl AddWindow @@ -561267,7 +561268,7 @@ sub_8130098: ; 8130098 movs r1, 0 bl FillWindowPixelBuffer ldrb r0, [r4] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r4] movs r1, 0x3 bl CopyWindowToVram @@ -561355,7 +561356,7 @@ sub_813010C: ; 813010C adds r2, r4, 0 bl Print movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @081301D4: add sp, 0xC pop {r4-r6} @@ -561467,8 +561468,8 @@ sub_8130280: ; 8130280 sub_81302D0: ; 81302D0 push {lr} bl sub_8130280 - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -561490,7 +561491,7 @@ sub_81302E8: ; 81302E8 bl species_and_otid_get_pal ldr r7, =0x030061c4 ldr r1, [r7] - bl call_LZZUnCompVram + bl LZDecompressVram cmp r4, 0 bne @08130348 lsls r0, r5, 3 @@ -561502,7 +561503,7 @@ sub_81302E8: ; 81302E8 ldr r2, [r6] ldr r3, [r2] adds r2, r5, 0 - bl sub_8034B50 + bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack ldr r0, [r4] ldr r0, [r0, 0x8] ldr r1, [r7] @@ -561521,7 +561522,7 @@ sub_81302E8: ; 81302E8 ldr r2, [r6] ldr r3, [r2] adds r2, r5, 0 - bl sub_8034B50 + bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack ldr r0, [r4] ldr r0, [r0, 0x4] ldr r1, [r7] @@ -568550,7 +568551,7 @@ sub_8133BE4: ; 8133BE4 movs r1, 0 bl sub_8198070 ldrb r0, [r4, 0x6] - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r4, 0x6] bl RemoveWindow movs r0, 0 @@ -568876,8 +568877,8 @@ sub_8133EDC: ; 8133EDC thumb_func_start sub_8133EF8 sub_8133EF8: ; 8133EF8 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -568997,9 +568998,9 @@ set_256color_bg_bg0: ; 8133F0C bl clear_scheduled_bg_copies_to_vram bl remove_some_task bl clear_tasks - bl reset_all_obj_data + bl ResetAllObjectData bl sub_80A1A74 - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator bl dp13_810BB8C bl sub_8098C64 movs r1, 0xE0 @@ -569010,11 +569011,11 @@ set_256color_bg_bg0: ; 8133F0C movs r2, 0x40 bl gpu_pal_apply ldr r0, =gUnknown_085B1ED8 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085B1EE8 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085B1EF8 - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes movs r0, 0x1 negs r0, r0 mov r1, r9 @@ -569079,7 +569080,7 @@ set_256color_bg_bg0: ; 8133F0C movs r1, 0x78 movs r2, 0x38 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r3, =0x02020630 @@ -569095,7 +569096,7 @@ set_256color_bg_bg0: ; 8133F0C ldrb r2, [r5, 0x1] adds r0, r6, 0 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -569109,7 +569110,7 @@ set_256color_bg_bg0: ; 8133F0C ldrb r2, [r5, 0x3] adds r0, r6, 0 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -569123,7 +569124,7 @@ set_256color_bg_bg0: ; 8133F0C ldrb r2, [r5, 0x5] adds r0, r6, 0 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -569151,8 +569152,8 @@ set_256color_bg_bg0: ; 8133F0C sub_81341E0: ; 81341E0 push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl do_scheduled_bg_tilemap_copies_to_vram bl fade_and_return_progress_probably pop {r0} @@ -569188,7 +569189,7 @@ sub_81341FC: ; 81341FC movs r3, 0 bl Print movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram ldr r0, =sub_813425C @@ -569230,7 +569231,7 @@ sub_813425C: ; 813425C adds r1, r5, 0 adds r2, r4, 0 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0xC] @@ -569449,7 +569450,7 @@ sub_8134400: ; 8134400 lsrs r0, 27 bl rotscale_free_entry adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, =sub_81344AC str r0, [r5] @0813449A: @@ -569569,7 +569570,7 @@ sub_81344C8: ; 81344C8 movs r3, 0x11 bl box_print ldrb r0, [r4] - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram mov r2, r10 @@ -569617,7 +569618,7 @@ sub_8134604: ; 8134604 movs r1, 0 bl FillWindowPixelBuffer ldrb r0, [r4] - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r4] bl RemoveWindow movs r0, 0xFF @@ -569780,13 +569781,13 @@ sub_813473C: ; 813473C bne @08134768 adds r0, r3, 0 movs r1, 0x1 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent b @08134770 .pool @08134768: adds r0, r3, 0 movs r1, 0 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent @08134770: pop {r0} bx r0 @@ -569835,8 +569836,8 @@ sub_8134774: ; 8134774 thumb_func_start sub_81347B4 sub_81347B4: ; 81347B4 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -570005,13 +570006,13 @@ LoadWallClockGraphics: ; 81347C8 bl clear_scheduled_bg_copies_to_vram bl remove_some_task bl clear_tasks - bl reset_all_obj_data + bl ResetAllObjectData bl sub_80A1A74 - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator ldr r0, =gUnknown_085B2208 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085B2218 - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes add sp, 0x8 pop {r3} mov r8, r3 @@ -570103,7 +570104,7 @@ Cb2_StartWallClock: ; 81349F4 movs r1, 0x78 movs r2, 0x50 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r1, =0x02020630 @@ -570133,7 +570134,7 @@ Cb2_StartWallClock: ; 81349F4 movs r1, 0x78 movs r2, 0x50 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -570155,7 +570156,7 @@ Cb2_StartWallClock: ; 81349F4 movs r1, 0x78 movs r2, 0x50 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -570169,7 +570170,7 @@ Cb2_StartWallClock: ; 81349F4 movs r1, 0x78 movs r2, 0x50 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -570190,7 +570191,7 @@ Cb2_StartWallClock: ; 81349F4 movs r3, 0 bl Print movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram add sp, 0xC @@ -570248,7 +570249,7 @@ Cb2_ViewWallClock: ; 8134B44 movs r1, 0x78 movs r2, 0x50 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r6, =0x02020630 @@ -570279,7 +570280,7 @@ Cb2_ViewWallClock: ; 8134B44 movs r1, 0x78 movs r2, 0x50 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -570301,7 +570302,7 @@ Cb2_ViewWallClock: ; 8134B44 movs r1, 0x78 movs r2, 0x50 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -570315,7 +570316,7 @@ Cb2_ViewWallClock: ; 8134B44 movs r1, 0x78 movs r2, 0x50 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -570337,7 +570338,7 @@ Cb2_ViewWallClock: ; 8134B44 movs r3, 0 bl Print movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram add sp, 0x10 @@ -570355,8 +570356,8 @@ Cb2_ViewWallClock: ; 8134B44 sub_8134C9C: ; 8134C9C push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl do_scheduled_bg_tilemap_copies_to_vram bl fade_and_return_progress_probably pop {r0} @@ -570520,7 +570521,7 @@ sub_8134DC4: ; 8134DC4 movs r3, 0 bl Print movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram ldr r0, =gUnknown_085B21F4 @@ -570581,7 +570582,7 @@ c3_80BF560: ; 8134E30 movs r1, 0 bl sub_8198070 movs r0, 0 - bl ClearWindowTileMap + bl ClearWindowTilemap ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -571049,7 +571050,7 @@ sub_81351AC: ; 81351AC lsrs r3, 16 str r1, [sp] movs r0, 0 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix ldr r1, =gUnknown_085B22D0 lsls r2, r7, 1 adds r0, r2, r1 @@ -571127,7 +571128,7 @@ sub_8135244: ; 8135244 lsrs r3, 16 str r1, [sp] movs r0, 0x1 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix ldr r1, =gUnknown_085B22D0 lsls r2, r7, 1 adds r0, r2, r1 @@ -571545,7 +571546,7 @@ sub_8135578: ; 8135578 ldr r1, =0x02020630 adds r0, r1 ldrb r1, [r6, 0x8] - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0x6 bl FieldEffectActiveListRemove ldr r1, =0x03005e00 @@ -571904,8 +571905,8 @@ sub_8135908: ; 8135908 sub_813591C: ; 813591C push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl do_scheduled_bg_tilemap_copies_to_vram bl fade_and_return_progress_probably pop {r0} @@ -571915,8 +571916,8 @@ sub_813591C: ; 813591C thumb_func_start sub_8135938 sub_8135938: ; 8135938 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -571999,7 +572000,7 @@ sub_8135978: ; 8135978 b @08135BA6 .pool @08135A08: - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator b @08135B9E @08135A0E: bl sub_80A1A74 @@ -572015,7 +572016,7 @@ sub_8135978: ; 8135978 b @08135BA6 .pool @08135A30: - bl reset_all_obj_data + bl ResetAllObjectData b @08135B9E @08135A36: ldr r0, =0x0203ab50 @@ -572203,7 +572204,7 @@ sub_8135BDC: ; 8135BDC ldr r0, =0x0203ab50 ldr r1, [r0] movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap bl sub_8121E10 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram @@ -572271,7 +572272,7 @@ sub_8135C38: ; 8135C38 ldr r0, =gUnknown_08D9B7C8 ldr r4, =0x0203ab50 ldr r1, [r4] - bl call_LZZUnCompWram + bl LZDecompressWram ldr r1, [r4] b @08135CE2 .pool @@ -572284,12 +572285,12 @@ sub_8135C38: ; 8135C38 .pool @08135CCC: ldr r0, =gUnknown_085B26F4 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic b @08135CDE .pool @08135CD8: ldr r0, =gUnknown_085B26FC - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette @08135CDE: ldr r0, =0x0203ab50 ldr r1, [r0] @@ -572421,7 +572422,7 @@ sub_8135DAC: ; 8135DAC movs r4, 0 @08135DFE: adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -572691,7 +572692,7 @@ sub_8135FCC: ; 8135FCC str r0, [sp, 0x4] add r1, sp, 0x8 adds r2, r4, 0 - bl CopyToBgTileMapBufferRect + bl CopyToBgTilemapBufferRect lsls r0, r7, 24 lsrs r5, r0, 24 cmp r5, 0x4 @@ -572745,7 +572746,7 @@ sub_8135FCC: ; 8135FCC str r0, [sp, 0x4] add r1, sp, 0x8 adds r2, r4, 0 - bl CopyToBgTileMapBufferRect + bl CopyToBgTilemapBufferRect adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -572784,7 +572785,7 @@ sub_8136110: ; 8136110 movs r0, 0x2 str r0, [sp, 0x4] movs r2, 0xF - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram add sp, 0x8 @@ -573191,7 +573192,7 @@ sub_8136444: ; 8136444 asrs r5, 16 adds r1, r4, 0 adds r2, r5, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 pop {r4,r5} @@ -573328,8 +573329,8 @@ sub_8136524: ; 8136524 adds r1, r4, 0 bl sub_81AE6C8 bl sub_8136418 - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator ldr r0, [r6] movs r1, 0x80 lsls r1, 4 @@ -573787,7 +573788,7 @@ sub_8136938: ; 8136938 movs r2, 0 bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed ldrb r0, [r6, 0x2] - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram ldr r1, =0x03005e00 @@ -574752,8 +574753,8 @@ sub_81371B4: ; 81371B4 sub_81371D4: ; 81371D4 push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r0} bx r0 @@ -574762,8 +574763,8 @@ sub_81371D4: ; 81371D4 thumb_func_start sub_81371EC sub_81371EC: ; 81371EC push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -574837,7 +574838,7 @@ c2_change_map: ; 8137200 ldr r0, [r1, 0x8] bl sub_80A1A74 bl clear_tasks - bl reset_all_obj_data + bl ResetAllObjectData ldr r3, =0x04000208 ldrh r2, [r3] strh r4, [r3] @@ -579891,7 +579892,7 @@ sub_8139B60: ; 8139B60 movs r1, 0x1 bl Print ldrb r0, [r5] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r5] movs r1, 0x3 bl CopyWindowToVram @@ -581712,9 +581713,9 @@ sub_813AA60: ; 813AA60 @0813AB2C: ldr r4, =0x0000157c adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag lsls r0, r5, 24 lsrs r0, 24 str r4, [sp] @@ -581789,9 +581790,9 @@ sub_813ABD4: ; 813ABD4 lsrs r5, 16 ldr r4, =0x0000157c adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag adds r0, r4, 0 adds r1, r4, 0 adds r2, r5, 0 @@ -581853,7 +581854,7 @@ sub_813AC44: ; 813AC44 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_resources + bl RemoveObjectAndFreeResources @0813AC6A: ldr r1, =0x0203ab6c movs r0, 0x40 @@ -582102,7 +582103,7 @@ sub_813ADD4: ; 813ADD4 ldrh r0, [r6, 0x22] lsls r0, 24 lsrs r0, 24 - bl PutWindowTileMap + bl PutWindowTilemap ldrh r0, [r6, 0x22] lsls r0, 24 lsrs r0, 24 @@ -582221,7 +582222,7 @@ sub_813AF48: ; 813AF48 ldrh r0, [r4, 0x22] lsls r0, 24 lsrs r0, 24 - bl ClearWindowTileMap + bl ClearWindowTilemap ldrh r0, [r4, 0x22] lsls r0, 24 lsrs r0, 24 @@ -584829,7 +584830,7 @@ sub_813C4BC: ; 813C4BC ble @0813C540 ldr r4, =0x0203ab74 ldrb r0, [r4] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r4] movs r1, 0x3 bl CopyWindowToVram @@ -584980,7 +584981,7 @@ sub_813C6A8: ; 813C6A8 movs r1, 0 bl FillWindowPixelBuffer adds r0, r4, 0 - bl ClearWindowTileMap + bl ClearWindowTilemap adds r0, r4, 0 movs r1, 0x2 bl CopyWindowToVram @@ -585134,9 +585135,9 @@ sub_813C80C: ; 813C80C push {lr} bl remove_some_task bl clear_tasks - bl reset_all_obj_data + bl ResetAllObjectData bl sub_80A1A74 - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator pop {r0} bx r0 thumb_func_end sub_813C80C @@ -585210,7 +585211,7 @@ sub_813C890: ; 813C890 adds r0, r4, 0 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBufferRect + bl CopyToBgTilemapBufferRect ldr r0, =gUnknown_085B3544 movs r1, 0 movs r2, 0x20 @@ -585225,8 +585226,8 @@ sub_813C890: ; 813C890 thumb_func_start sub_813C8D8 sub_813C8D8: ; 813C8D8 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -585236,8 +585237,8 @@ sub_813C8D8: ; 813C8D8 sub_813C8EC: ; 813C8EC push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r0} bx r0 @@ -585306,7 +585307,7 @@ sub_813C91C: ; 813C91C bl InitBgsFromTemplates ldr r1, [r4] movs r0, 0x3 - bl SetBgTileMap + bl SetBgTilemap bl sub_813C828 b @0813CA00 .pool @@ -585330,7 +585331,7 @@ sub_813C91C: ; 813C91C movs r0, 0x3 bl ShowBg movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @0813CA00 @0813C9DE: ldr r0, =gUnknown_085B3D6C @@ -585445,7 +585446,7 @@ sub_813CA68: ; 813CA68 lsls r2, 3 movs r0, 0x2 movs r3, 0 - bl LoadBgTileMap + bl LoadBgTilemap b @0813CB24 .pool @0813CAEC: @@ -586662,8 +586663,8 @@ sub_813D42C: ; 813D42C .4byte @0813D544 .4byte @0813D56C @0813D48C: - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator movs r0, 0x3 bl HideBg movs r0, 0x2 @@ -586935,9 +586936,9 @@ sub_813D6D0: ; 813D6D0 mov r5, r8 push {r5-r7} ldr r0, =gUnknown_085B401C - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, =gUnknown_085B4024 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette ldr r0, =0x03001204 movs r1, 0 strh r1, [r0] @@ -587017,7 +587018,7 @@ sub_813D6D0: ; 813D6D0 ldrsh r2, [r3, r0] ldr r0, =gUnknown_085B4034 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -587083,9 +587084,9 @@ sub_813D6D0: ; 813D6D0 sub_813D824: ; 813D824 push {r4,r5,lr} movs r0, 0x2 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0x2 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag movs r4, 0 ldr r1, =0x0203ab7c ldr r0, [r1] @@ -587104,7 +587105,7 @@ sub_813D824: ; 813D824 adds r0, r2 adds r0, r1 ldr r0, [r0] - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -587117,9 +587118,9 @@ sub_813D824: ; 813D824 bcc @0813D846 @0813D86C: movs r0, 0x3 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0x3 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag movs r4, 0 @0813D87A: ldr r0, =0x0203ab7c @@ -587132,7 +587133,7 @@ sub_813D824: ; 813D824 ldr r0, [r0] cmp r0, 0 beq @0813D892 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0813D892: adds r0, r4, 0x1 lsls r0, 16 @@ -587159,9 +587160,9 @@ sub_813D8A8: ; 813D8A8 ldr r0, =gUnknown_08DC4140 bl LZ77UnCompWram mov r0, sp - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, =gUnknown_085B40EC - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette add sp, 0x8 pop {r0} bx r0 @@ -587209,7 +587210,7 @@ sub_813D8E8: ; 813D8E8 ldr r0, =gUnknown_085B40FC movs r2, 0x8C movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -587450,10 +587451,10 @@ evolution_cutscene: ; 813DA8C strb r0, [r1] bl c2_berry_program_update_menu bl sub_8035AA4 - bl reset_all_obj_data + bl ResetAllObjectData bl remove_some_task bl clear_tasks - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator ldr r0, =0x0300301c movs r2, 0x4 strb r2, [r0] @@ -587498,7 +587499,7 @@ evolution_cutscene: ; 813DA8C ldr r1, [r2] ldr r1, [r1, 0x8] adds r2, r5, 0 - bl LZ77UnCompAnyRam + bl DecompressPicFromTable_2 adds r0, r5, 0 ldr r1, [sp, 0x20] mov r2, r9 @@ -587518,7 +587519,7 @@ evolution_cutscene: ; 813DA8C movs r1, 0x78 movs r2, 0x40 movs r3, 0x1E - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, =0x0203ab80 ldr r2, [r1] lsls r1, r0, 24 @@ -587554,7 +587555,7 @@ evolution_cutscene: ; 813DA8C ldr r1, [r2] ldr r1, [r1, 0x10] mov r2, r10 - bl LZ77UnCompAnyRam + bl DecompressPicFromTable_2 mov r0, r10 ldr r1, [sp, 0x20] mov r2, r9 @@ -587574,7 +587575,7 @@ evolution_cutscene: ; 813DA8C movs r1, 0x78 movs r2, 0x40 movs r3, 0x1E - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, =0x0203ab80 ldr r2, [r1] lsls r1, r0, 24 @@ -587743,8 +587744,8 @@ sub_813DD7C: ; 813DD7C strb r0, [r1] bl c2_berry_program_update_menu bl sub_8035AA4 - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator ldr r1, =0x0300301c movs r0, 0x4 strb r0, [r1] @@ -587755,7 +587756,7 @@ sub_813DD7C: ; 813DD7C ldr r1, [r1] ldr r1, [r1, 0x10] adds r2, r5, 0 - bl LZ77UnCompAnyRam + bl DecompressPicFromTable_2 adds r0, r5, 0 mov r1, r9 adds r2, r6, 0 @@ -587774,7 +587775,7 @@ sub_813DD7C: ; 813DD7C movs r1, 0x78 movs r2, 0x40 movs r3, 0x1E - bl obj_add_from_template_forward_search + bl AddObjectToFront mov r2, r8 ldr r1, [r2] lsls r2, r0, 24 @@ -587883,8 +587884,8 @@ sub_813DF70: ; 813DF70 bl SetHBlankCallback movs r0, 0 bl SetVBlankCallback - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator ldr r1, =0x0300301c movs r0, 0x4 strb r0, [r1] @@ -587935,9 +587936,9 @@ sub_813DF70: ; 813DF70 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 @@ -587960,7 +587961,7 @@ sub_813DF70: ; 813DF70 ldr r1, [r1] ldr r1, [r1, 0x10] adds r2, r6, 0 - bl LZ77UnCompAnyRam + bl DecompressPicFromTable_2 adds r0, r6, 0 adds r1, r5, 0 adds r2, r4, 0 @@ -587982,7 +587983,7 @@ sub_813DF70: ; 813DF70 movs r1, 0x78 movs r2, 0x40 movs r3, 0x1E - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, =0x0203ab80 ldr r1, [r1] lsls r2, r0, 24 @@ -588130,7 +588131,7 @@ sub_813E1D4: ; 813E1D4 ldr r1, [r1] ldr r1, [r1, 0x8] adds r2, r5, 0 - bl LZ77UnCompAnyRam + bl DecompressPicFromTable_2 adds r0, r5, 0 mov r1, r10 adds r2, r7, 0 @@ -588149,7 +588150,7 @@ sub_813E1D4: ; 813E1D4 movs r1, 0x78 movs r2, 0x40 movs r3, 0x1E - bl obj_add_from_template_forward_search + bl AddObjectToFront mov r1, r9 ldr r2, [r1] lsls r1, r0, 24 @@ -588242,8 +588243,8 @@ sub_813E1D4: ; 813E1D4 thumb_func_start sub_813E3A4 sub_813E3A4: ; 813E3A4 push {lr} - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl RunTextPrinters bl fade_and_return_progress_probably bl run_active_tasks @@ -588254,8 +588255,8 @@ sub_813E3A4: ; 813E3A4 thumb_func_start sub_813E3C0 sub_813E3C0: ; 813E3C0 push {lr} - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl RunTextPrinters bl fade_and_return_progress_probably bl run_active_tasks @@ -590625,13 +590626,13 @@ sub_813F1B8: ; 813F1B8 bl sub_800E084 @0813FA3E: movs r0, 0x3 - bl GetBgTileMap + bl GetBgTilemap bl Free movs r0, 0x1 - bl GetBgTileMap + bl GetBgTilemap bl Free movs r0, 0 - bl GetBgTileMap + bl GetBgTilemap bl Free bl FreeAllWindowBuffers ldr r0, =0x020244ec @@ -590921,8 +590922,8 @@ sub_813FCDC: ; 813FCDC ldrh r1, [r0] movs r0, 0x1E bl SetGpuReg - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram bl sub_80BA0A8 pop {r0} @@ -590965,8 +590966,8 @@ sub_813FD64: ; 813FD64 ldrh r1, [r0] movs r0, 0x1E bl SetGpuReg - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram bl sub_80BA0A8 pop {r0} @@ -591268,16 +591269,16 @@ sub_8140000: ; 8140000 movs r0, 0x1 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer ldr r1, =gUnknown_085B4D10 adds r0, r4, 0 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram adds r0, r4, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram cmp r5, 0 bne @081400C4 ldr r1, =0x00000442 @@ -591476,8 +591477,8 @@ sub_8140208: ; 8140208 sub_8140238: ; 8140238 push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad ldr r0, =0x0203ab88 ldr r0, [r0] adds r1, r0, 0 @@ -591497,8 +591498,8 @@ sub_8140238: ; 8140238 sub_8140264: ; 8140264 push {r4,lr} sub sp, 0x4 - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram bl sub_8142814 ldr r4, =0x0203ab88 @@ -591636,17 +591637,17 @@ sub_8140388: ; 8140388 lsls r0, 1 adds r1, r0 movs r0, 0 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r2, =0x0000117c adds r1, r2 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x0000317c adds r1, r0 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap ldr r0, =gUnknown_085B614C bl InitWindows bl sub_8197200 @@ -591681,11 +591682,11 @@ sub_8140418: ; 8140418 str r4, [r0] bl FreeAllWindowBuffers movs r0, 0 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0x1 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0x2 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0 bl ResetBgsAndClearDma3BusyFlags ldr r0, [r5] @@ -591909,7 +591910,7 @@ sub_81405CC: ; 81405CC .pool @08140650: bl sub_80A1A74 - bl reset_all_obj_data + bl ResetAllObjectData bl clear_tasks bl reset_temp_tile_data_buffers b @081407F8 @@ -591946,7 +591947,7 @@ sub_81405CC: ; 81405CC movs r0, 0x2 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer b @081407F8 .pool @081406C0: @@ -591960,8 +591961,8 @@ sub_81405CC: ; 81405CC bl sub_81431E4 b @081407F8 @081406E0: - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl sub_8145C30 lsls r0, 16 lsrs r0, 16 @@ -592005,9 +592006,9 @@ sub_81405CC: ; 81405CC movs r0, 0 bl SetGpuReg movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0 bl ShowBg movs r0, 0x1 @@ -594714,9 +594715,9 @@ sub_8141E7C: ; 8141E7C movs r0, 0x54 movs r1, 0 bl SetGpuReg - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator bl sub_80A1A74 - bl reset_all_obj_data + bl ResetAllObjectData bl sub_8140418 ldr r1, =0x03005dac ldr r0, =sub_80AF168 @@ -596306,25 +596307,25 @@ sub_8142C0C: ; 8142C0C lsls r0, 24 cmp r0, 0 bne @08142C44 - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator ldr r0, =gUnknown_085B7384 - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes ldr r0, =gUnknown_085B7864 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085B7978 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085B7A40 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic b @08142C5A .pool @08142C44: movs r0, 0xE - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0xD - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0xC - bl gpu_tile_obj_free_by_tag - bl gpu_pal_allocator_reset + bl FreeObjectTilesByTag + bl ResetObjectPaletteAllocator @08142C5A: pop {r0} bx r0 @@ -596341,7 +596342,7 @@ sub_8142C60: ; 8142C60 ldrb r3, [r1] movs r1, 0x74 movs r2, 0x50 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 @@ -596404,7 +596405,7 @@ sub_8142CD0: ; 8142CD0 orrs r0, r1 str r0, [sp, 0x4] mov r0, sp - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r4, =gUnknown_085B7490 ldr r0, [r4] adds r1, r5, 0 @@ -596415,7 +596416,7 @@ sub_8142CD0: ; 8142CD0 ldrh r0, [r4, 0x6] strh r0, [r6, 0x6] mov r0, sp - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic movs r6, 0 ldr r0, =0x02020630 mov r8, r0 @@ -596436,7 +596437,7 @@ sub_8142CD0: ; 8142CD0 adds r2, r4, 0 adds r2, 0x5C movs r3, 0x1E - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, =0x0203ab88 ldr r1, [r1] adds r2, r5, 0 @@ -596487,7 +596488,7 @@ sub_8142CD0: ; 8142CD0 asrs r1, 16 movs r2, 0x46 movs r3, 0x1E - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, =0x0203ab88 ldr r1, [r1] adds r1, r6 @@ -596522,7 +596523,7 @@ sub_8142CD0: ; 8142CD0 asrs r2, 16 movs r1, 0x7E movs r3, 0x1E - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, =0x0203ab88 ldr r1, [r1] adds r1, r6 @@ -596568,7 +596569,7 @@ sub_8142E3C: ; 8142E3C lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -596727,7 +596728,7 @@ sub_8142F7C: ; 8142F7C movs r1, 0x74 movs r2, 0x14 movs r3, 0xA - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r6] adds r3, r5, 0 adds r3, 0x31 @@ -596788,7 +596789,7 @@ sub_8142F7C: ; 8142F7C lsls r0, 2 adds r0, r4 movs r1, 0x8 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -597030,7 +597031,7 @@ sub_81431E4: ; 81431E4 ldrh r1, [r4, 0x4] orrs r1, r2 str r1, [r0, 0x4] - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic movs r1, 0xF mov r0, sp strh r1, [r0] @@ -597188,7 +597189,7 @@ sub_8143314: ; 8143314 orrs r0, r2 str r0, [r6, 0x4] mov r0, sp - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -597198,7 +597199,7 @@ sub_8143314: ; 8143314 movs r1, 0xD0 movs r2, 0x10 movs r3, 0x4 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r3, =0x0203ab88 ldr r1, [r3] adds r1, 0x50 @@ -597227,7 +597228,7 @@ sub_8143314: ; 8143314 ldr r0, =gUnknown_085B77FC movs r2, 0x18 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] adds r3, r5, 0 adds r3, 0x15 @@ -597269,7 +597270,7 @@ sub_8143314: ; 8143314 movs r1, 0x78 movs r2, 0x44 movs r3, 0x4 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r2, =0x0203ab88 ldr r1, [r2] adds r1, 0x55 @@ -597298,7 +597299,7 @@ sub_8143314: ; 8143314 ldr r0, =gUnknown_085B782C movs r2, 0x24 movs r3, 0x4 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r4] adds r2, r5, 0 adds r2, 0x1A @@ -597342,7 +597343,7 @@ sub_8143314: ; 8143314 movs r1, 0x98 movs r2, 0x60 movs r3, 0x9 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r3, =0x0203ab88 ldr r1, [r3] adds r1, 0x6C @@ -597903,12 +597904,12 @@ sub_814391C: ; 814391C orrs r0, r1 str r0, [sp, 0x4] mov r0, sp - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, =gUnknown_085B7950 movs r1, 0x74 movs r2, 0x50 movs r3, 0x51 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r2, =0x02020630 @@ -597978,7 +597979,7 @@ sub_81439C8: ; 81439C8 ldr r0, =gUnknown_085B7928 movs r1, 0x74 movs r2, 0x50 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r5] adds r1, 0x3C adds r1, r4 @@ -598060,7 +598061,7 @@ sub_8143A40: ; 8143A40 ldr r1, =DummyObjectCallback str r1, [r2] movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim movs r1, 0 adds r2, r5, 0x1 adds r3, r6, 0x1 @@ -598438,7 +598439,7 @@ sub_8143CFC: ; 8143CFC lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r5, 0 bl sub_8143B14 movs r0, 0x1E @@ -598694,7 +598695,7 @@ sub_8143FA4: ; 8143FA4 lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r5, 0 bl sub_8143B14 movs r0, 0x1E @@ -598949,7 +598950,7 @@ prev_quest_read_x24_hm_usage: ; 81441A8 lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r5, 0 bl sub_8143B14 movs r0, 0x1E @@ -599031,7 +599032,7 @@ sub_8144264: ; 8144264 lsls r1, 24 lsrs r1, 24 adds r0, r6, 0 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r6, 0 bl sub_8143B14 movs r0, 0x1E @@ -599515,7 +599516,7 @@ sub_81446DC: ; 81446DC negs r2, r2 movs r1, 0x24 movs r3, 0x32 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r5] adds r1, 0x73 strb r0, [r1] @@ -599535,7 +599536,7 @@ sub_81446DC: ; 81446DC ldrsh r2, [r0, r3] adds r0, r4, 0 movs r3, 0x3B - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r5] adds r1, 0x74 strb r0, [r1] @@ -599544,7 +599545,7 @@ sub_81446DC: ; 81446DC movs r1, 0x24 movs r2, 0x8C movs r3, 0x33 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r5] adds r1, 0x75 strb r0, [r1] @@ -599749,7 +599750,7 @@ sub_81448B8: ; 81448B8 movs r3, 0 ldrsh r2, [r2, r3] movs r3, 0x32 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r5, =0x0203ab88 ldr r1, [r5] adds r1, 0x73 @@ -599765,7 +599766,7 @@ sub_81448B8: ; 81448B8 ldrh r1, [r7, 0x2E] lsls r1, 24 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =gUnknown_085B7AEC movs r1, 0x2E ldrsh r2, [r7, r1] @@ -599778,7 +599779,7 @@ sub_81448B8: ; 81448B8 movs r3, 0 ldrsh r2, [r4, r3] movs r3, 0x33 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r5] adds r1, 0x74 strb r0, [r1] @@ -600211,7 +600212,7 @@ sub_8144C70: ; 8144C70 strb r0, [r3, 0x3] @08144CAC: adds r0, r2, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, [r4] movs r0, 0 strb r0, [r1, 0x1] @@ -600311,7 +600312,7 @@ sub_8144CD0: ; 8144CD0 ands r1, r2 strb r1, [r0] adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08144D7E: add sp, 0x18 pop {r4} @@ -600600,7 +600601,7 @@ sub_8144FB0: ; 8144FB0 movs r0, 0x5E bl m4aSongNumStop adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r5, =0x02020630 ldr r4, =0x0203ab88 ldr r0, [r4] @@ -600621,7 +600622,7 @@ sub_8144FB0: ; 8144FB0 adds r0, r1 lsls r0, 2 adds r0, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0814501C: pop {r4,r5} pop {r0} @@ -600693,7 +600694,7 @@ sub_8145030: ; 8145030 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =sub_8144FB0 str r0, [r4, 0x1C] ldr r2, =0x02020630 @@ -600845,7 +600846,7 @@ sub_81450D8: ; 81450D8 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0x2D strh r0, [r4, 0x30] ldr r0, =sub_8145030 @@ -601678,9 +601679,9 @@ sub_8145850: ; 8145850 .pool @081458B0: ldr r0, =gUnknown_085B8C80 - bl gpu_tile_obj_alloc_and_load_multiple + bl LoadObjectPics ldr r0, =gUnknown_085B8C90 - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes ldr r0, =gUnknown_085B8C68 ldrb r1, [r4, 0x4] lsls r1, 19 @@ -601695,7 +601696,7 @@ sub_8145850: ; 8145850 adds r2, r3 asrs r2, 16 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r2, =0x0203ab98 ldr r3, [r2] lsls r0, 24 @@ -601733,17 +601734,17 @@ sub_8145914: ; 8145914 adds r0, r4 ldrb r0, [r0, 0x5] lsrs r0, 4 - bl gpu_pal_tag_by_index + bl GetObjectPaletteTagBySlot lsls r0, 16 lsrs r0, 16 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag ldr r0, [r6] ldrh r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r4, =0x0203ab90 ldr r0, [r4] bl Free @@ -601937,7 +601938,7 @@ sub_814596C: ; 814596C ldrh r0, [r4, 0x6] str r0, [sp] movs r0, 0 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix ldr r2, =gUnknown_08329F40 ldr r0, [r6] ldrb r0, [r0] @@ -602077,7 +602078,7 @@ sub_8145BAC: ; 8145BAC movs r1, 0 bl FillWindowPixelBuffer ldrb r0, [r4] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r4] movs r2, 0x85 lsls r2, 2 @@ -602444,8 +602445,8 @@ sub_8145E84: ; 8145E84 bl SetMainCallback2 @08145EC0: bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r4} pop {r0} @@ -604635,7 +604636,7 @@ sub_81470D0: ; 81470D0 movs r3, 0x4 ldrsh r2, [r5, r3] movs r3, 0 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 ldr r1, =0x02020630 @@ -606838,12 +606839,12 @@ sub_8148218: ; 8148218 movs r1, 0x1 movs r2, 0x3 movs r3, 0x3 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft adds r0, r6, 0 movs r1, 0x1 movs r2, 0x3 movs r3, 0x3 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft ldrb r0, [r5, 0x3] lsls r0, 26 lsrs r0, 27 @@ -609558,7 +609559,7 @@ sub_8149864: ; 8149864 adds r0, 0x1 strh r0, [r1, 0x20] adds r0, r3, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0814994C: pop {r4-r6} pop {r0} @@ -610303,8 +610304,8 @@ sub_8149F08: ; 8149F08 thumb_func_start sub_8149F2C sub_8149F2C: ; 8149F2C push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -611400,7 +611401,7 @@ sub_814A798: ; 814A798 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r6, 0x1 str r6, [sp] str r4, [sp, 0x4] @@ -611410,7 +611411,7 @@ sub_814A798: ; 814A798 movs r1, 0x1 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r6, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -611418,9 +611419,9 @@ sub_814A798: ; 814A798 movs r1, 0x1 movs r2, 0x1D movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, =gUnknown_085C8578 movs r1, 0xF0 movs r2, 0x20 @@ -611468,9 +611469,9 @@ sub_814A828: ; 814A828 movs r0, 0 movs r2, 0 movs r3, 0 - bl CopyRectToBgTileMapBufferRect + bl CopyRectToBgTilemapBufferRect movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldrh r0, [r4, 0xC] adds r0, 0x4 strh r0, [r4, 0xC] @@ -611580,9 +611581,9 @@ sub_814A898: ; 814A898 movs r1, 0x1 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -611621,7 +611622,7 @@ sub_814A960: ; 814A960 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r6, 0x1 str r6, [sp] str r4, [sp, 0x4] @@ -611631,7 +611632,7 @@ sub_814A960: ; 814A960 movs r1, 0x1 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r6, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -611639,9 +611640,9 @@ sub_814A960: ; 814A960 movs r1, 0x1 movs r2, 0x1D movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r4, =gUnknown_085C8578 adds r0, r4, 0 movs r1, 0xE0 @@ -611714,9 +611715,9 @@ sub_814AA04: ; 814AA04 str r0, [sp, 0x20] movs r2, 0 movs r3, 0 - bl CopyRectToBgTileMapBufferRect + bl CopyRectToBgTilemapBufferRect movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldrh r0, [r6, 0xC] subs r0, 0x1 strh r0, [r6, 0xC] @@ -611812,7 +611813,7 @@ sub_814AAB8: ; 814AAB8 mov r1, r8 movs r2, 0 movs r3, 0 - bl CopyRectToBgTileMapBufferRect + bl CopyRectToBgTilemapBufferRect b @0814AB78 .pool @0814AB2C: @@ -611847,7 +611848,7 @@ sub_814AAB8: ; 814AAB8 movs r0, 0 movs r1, 0x1 adds r2, r4, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect @0814AB72: ldrh r0, [r7, 0xC] adds r0, 0x1 @@ -611862,7 +611863,7 @@ sub_814AAB8: ; 814AAB8 strh r0, [r7, 0x8] @0814AB86: movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0 add sp, 0x24 pop {r3} @@ -611885,9 +611886,9 @@ sub_814ABA0: ; 814ABA0 movs r1, 0x1 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x1 negs r0, r0 movs r1, 0x10 @@ -611963,9 +611964,9 @@ sub_814AC38: ; 814AC38 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, =gUnknown_085C8578 movs r1, 0xF0 movs r2, 0x20 @@ -612092,9 +612093,9 @@ sub_814AD48: ; 814AD48 str r0, [sp, 0x20] movs r2, 0 movs r3, 0 - bl CopyRectToBgTileMapBufferRect + bl CopyRectToBgTilemapBufferRect movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldrh r0, [r4, 0xC] adds r0, 0x1 strh r0, [r4, 0xC] @@ -612157,9 +612158,9 @@ sub_814ADD8: ; 814ADD8 str r0, [sp, 0x8] movs r0, 0 movs r1, 0x1 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldrh r0, [r4, 0xC] adds r0, 0x1 strh r0, [r4, 0xC] @@ -612207,9 +612208,9 @@ sub_814AE40: ; 814AE40 movs r1, 0x1 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x1 negs r0, r0 movs r1, 0x10 @@ -612345,7 +612346,7 @@ sub_814AF54: ; 814AF54 adds r0, r1 lsls r0, 2 adds r0, r6 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles bl dp01_tbl4_exec_completed @0814AFA4: pop {r4-r6} @@ -612593,7 +612594,7 @@ sub_814B0E8: ; 814B0E8 adds r0, r1 lsls r0, 2 add r0, r10 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r4, =0x03005d70 ldrb r0, [r7] mov r1, r8 @@ -612631,7 +612632,7 @@ sub_814B0E8: ; 814B0E8 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r5, =0x03005d70 ldrb r1, [r4] adds r0, r1, r5 @@ -612808,7 +612809,7 @@ sub_814B340: ; 814B340 adds r0, r1 lsls r0, 2 adds r0, r6 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, =0x03005d70 ldrb r0, [r4] adds r0, r1 @@ -612855,7 +612856,7 @@ sub_814B3DC: ; 814B3DC adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 @@ -613066,9 +613067,9 @@ sub_814B5A8: ; 814B5A8 strb r0, [r1, 0x1] ldr r4, =0x000027f9 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag ldr r0, =c3_0802FDF4 movs r1, 0xA bl AddTask @@ -613093,7 +613094,7 @@ sub_814B5A8: ; 814B5A8 ldr r1, =0x02020630 adds r0, r1 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r4, =0x03005d70 ldrb r1, [r7] adds r0, r1, r4 @@ -613180,7 +613181,7 @@ sub_814B69C: ; 814B69C cmp r0, 0 bne @0814B714 adds r0, r3, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 @@ -615420,7 +615421,7 @@ sub_814CB0C: ; 814CB0C mov r0, r8 adds r1, r5, 0 adds r2, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r4, =0x020241e4 ldrb r1, [r6] adds r1, r4 @@ -615466,7 +615467,7 @@ sub_814CB0C: ; 814CB0C ldr r1, =0x020244e4 adds r2, r1 ldrb r1, [r2] - bl obj_anim_image_start + bl StartObjectImageAnim ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 @@ -615596,7 +615597,7 @@ sub_814CC98: ; 814CC98 mov r0, r10 adds r1, r5, 0 adds r2, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r4, =0x020241e4 adds r4, r6, r4 strb r0, [r4] @@ -615648,7 +615649,7 @@ sub_814CC98: ; 814CC98 ldr r1, =0x020244e4 adds r6, r1 ldrb r1, [r6] - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -615735,7 +615736,7 @@ sub_814CE14: ; 814CE14 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 @@ -615951,7 +615952,7 @@ sub_814CF30: ; 814CF30 adds r0, r6, 0 mov r1, r8 adds r2, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r6, =0x020241e4 ldrb r1, [r5] adds r1, r6 @@ -617257,9 +617258,9 @@ sub_814DAA8: ; 814DAA8 lsls r0, 2 adds r0, r4 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =0x0000d6f9 - bl gpu_pal_alloc_new + bl AllocObjectPalette lsls r0, 24 lsrs r7, r0, 24 ldrb r0, [r6] @@ -620840,7 +620841,7 @@ battle_show_message_maybe: ; 814F9EC cmp r0, 0 beq @0814FB9C adds r0, r7, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r7, 0 movs r1, 0x3 bl CopyWindowToVram @@ -621111,9 +621112,9 @@ sub_814FCC8: ; 814FCC8 b @08150224 .pool @0814FDD8: - bl reset_all_obj_data + bl ResetAllObjectData bl clear_tasks - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator bl sub_80A1A74 bl reset_temp_tile_data_buffers bl sub_80AAFA4 @@ -621144,22 +621145,22 @@ sub_814FCC8: ; 814FCC8 ldr r1, [r4] adds r1, 0xFC movs r0, 0 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r3, =0x000010fc adds r1, r3 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x000020fc adds r1, r0 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r2, =0x000030fc adds r1, r2 movs r0, 0x3 - bl SetBgTileMap + bl SetBgTilemap ldr r2, =0x02021bbc ldr r1, =0x02021bbe movs r0, 0 @@ -621180,14 +621181,14 @@ sub_814FCC8: ; 814FCC8 @0814FE96: lsls r0, r4, 3 adds r0, r6 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 bls @0814FE96 ldr r0, =gUnknown_085CDB74 - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes ldr r0, =gUnknown_085CD67C adds r1, r5, 0 bl malloc_and_decompress @@ -621332,7 +621333,7 @@ sub_814FCC8: ; 814FCC8 movs r0, 0x1 movs r2, 0 movs r3, 0x11 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette ldr r0, [r6] ldr r2, =0x00004104 adds r0, r2 @@ -621346,7 +621347,7 @@ sub_814FCC8: ; 814FCC8 movs r0, 0x2 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette ldr r0, [r6] ldr r1, =0x00004108 adds r0, r1 @@ -621359,7 +621360,7 @@ sub_814FCC8: ; 814FCC8 movs r0, 0x3 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette ldr r0, [r6] ldr r2, =0x0000410c adds r0, r2 @@ -621371,7 +621372,7 @@ sub_814FCC8: ; 814FCC8 movs r0, 0x3 movs r2, 0 movs r3, 0x2 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -621401,7 +621402,7 @@ sub_814FCC8: ; 814FCC8 movs r0, 0 movs r2, 0 movs r3, 0xE - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette mov r3, r9 ldr r0, [r3] add r0, r8 @@ -621413,7 +621414,7 @@ sub_814FCC8: ; 814FCC8 movs r0, 0 movs r2, 0xC movs r3, 0x11 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette mov r1, r9 ldr r0, [r1] add r0, r8 @@ -621427,7 +621428,7 @@ sub_814FCC8: ; 814FCC8 movs r0, 0 movs r2, 0x18 movs r3, 0x14 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette mov r3, r9 ldr r0, [r3] add r0, r8 @@ -621438,7 +621439,7 @@ sub_814FCC8: ; 814FCC8 movs r0, 0 movs r2, 0 movs r3, 0x11 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette mov r1, r9 ldr r0, [r1] add r0, r8 @@ -621450,7 +621451,7 @@ sub_814FCC8: ; 814FCC8 movs r0, 0 movs r2, 0 movs r3, 0x14 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette mov r2, r9 ldr r0, [r2] add r0, r8 @@ -621461,7 +621462,7 @@ sub_814FCC8: ; 814FCC8 movs r0, 0 movs r2, 0xC movs r3, 0x14 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette mov r3, r9 ldr r0, [r3] add r0, r8 @@ -621473,7 +621474,7 @@ sub_814FCC8: ; 814FCC8 movs r0, 0 movs r2, 0xC movs r3, 0x17 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette mov r1, r9 ldr r0, [r1] add r0, r8 @@ -621484,7 +621485,7 @@ sub_814FCC8: ; 814FCC8 movs r0, 0 movs r2, 0x18 movs r3, 0x17 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 @@ -621564,8 +621565,8 @@ sub_814FCC8: ; 814FCC8 mainloop: ; 815023C push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably bl sound_something pop {r0} @@ -621610,16 +621611,16 @@ c2_8011A1C: ; 8150258 cmp r4, 0x13 bls @08150298 bl clear_tasks - bl reset_all_obj_data + bl ResetAllObjectData bl sub_80A1A74 movs r0, 0 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0x1 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0x2 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0x3 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0 bl ResetBgsAndClearDma3BusyFlags ldr r6, =0x0203abac @@ -621981,7 +621982,7 @@ sub_8150550: ; 8150550 movs r1, 0 movs r2, 0 movs r3, 0x16 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect b @08150630 @081505CA: movs r0, 0x2 @@ -622004,7 +622005,7 @@ sub_8150550: ; 8150550 movs r2, 0x2 @081505EC: movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect b @08150630 @081505F4: ldr r1, =0x00004108 @@ -622019,7 +622020,7 @@ sub_8150550: ; 8150550 movs r0, 0x3 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette ldr r0, [r6] ldr r1, =0x0000410c adds r0, r1 @@ -622031,7 +622032,7 @@ sub_8150550: ; 8150550 movs r0, 0x3 movs r2, 0 movs r3, 0x2 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette ldr r1, [r6] movs r0, 0x40 strb r0, [r1, 0x15] @@ -622123,7 +622124,7 @@ sub_8150664: ; 8150664 movs r0, 0x3 movs r2, 0 movs r3, 0x2 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette b @081507B6 .pool @081506E8: @@ -622136,7 +622137,7 @@ sub_8150664: ; 8150664 movs r1, 0 movs r2, 0x2 movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] movs r0, 0xA str r0, [sp, 0x4] @@ -622145,7 +622146,7 @@ sub_8150664: ; 8150664 movs r1, 0 movs r2, 0 movs r3, 0x16 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, [r7] movs r0, 0xC0 strb r0, [r1, 0x15] @@ -622162,7 +622163,7 @@ sub_8150664: ; 8150664 movs r0, 0x3 movs r2, 0x2 movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r0, [r7] adds r0, r5 ldr r0, [r0] @@ -622173,7 +622174,7 @@ sub_8150664: ; 8150664 movs r0, 0x3 movs r2, 0x3 movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r0, [r7] adds r0, r5 ldr r0, [r0] @@ -622184,7 +622185,7 @@ sub_8150664: ; 8150664 movs r0, 0x3 movs r2, 0x2 movs r3, 0x1 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r0, [r7] adds r0, r5 ldr r0, [r0] @@ -622195,7 +622196,7 @@ sub_8150664: ; 8150664 movs r0, 0x3 movs r2, 0x3 movs r3, 0x1 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect b @081507B6 .pool @08150784: @@ -622210,7 +622211,7 @@ sub_8150664: ; 8150664 movs r0, 0x3 movs r2, 0x4 movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r0, [r7] adds r0, r5 ldr r0, [r0] @@ -622221,7 +622222,7 @@ sub_8150664: ; 8150664 movs r0, 0x3 movs r2, 0x4 movs r3, 0x1 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect @081507B6: bl sub_81511B8 ldr r0, =0x0203abac @@ -622257,9 +622258,9 @@ sub_8150664: ; 8150664 sub_8150800: ; 8150800 push {r4,lr} movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r4, =0x0203abac ldr r0, [r4] ldrb r1, [r0, 0x14] @@ -622285,8 +622286,8 @@ sub_8150800: ; 8150800 ldrb r1, [r0, 0x9] movs r0, 0x12 bl SetGpuReg - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r4} pop {r0} @@ -622587,7 +622588,7 @@ sub_8150A68: ; 8150A68 cmp r0, 0xA0 ble @08150AEE adds r0, r2, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08150AEE: pop {r0} bx r0 @@ -622656,7 +622657,7 @@ sub_8150AF4: ; 8150AF4 cmp r0, 0x4F bgt @08150B68 adds r0, r2, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08150B68: pop {r0} bx r0 @@ -622824,9 +622825,9 @@ sub_8150B6C: ; 8150B6C movs r0, 0 bl SetGpuReg movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0 bl ShowBg movs r0, 0x1 @@ -622933,7 +622934,7 @@ sub_8150D28: ; 8150D28 movs r1, 0xB0 movs r2, 0x2B movs r3, 0x67 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r6, r0, 24 ldr r5, =0x02020630 @@ -622953,7 +622954,7 @@ sub_8150D28: ; 8150D28 movs r1, 0xC8 movs r2, 0x63 movs r3, 0x65 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r6, r0, 24 lsls r0, r6, 4 @@ -622996,7 +622997,7 @@ sub_8150D28: ; 8150D28 movs r0, 0 movs r2, 0x18 movs r3, 0x1A - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] @@ -623039,7 +623040,7 @@ sub_8150D28: ; 8150D28 movs r1, 0x68 movs r2, 0x9 movs r3, 0x67 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r6, r0, 24 ldr r5, =0x02020630 @@ -623059,7 +623060,7 @@ sub_8150D28: ; 8150D28 movs r1, 0x80 movs r2, 0x41 movs r3, 0x65 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r6, r0, 24 lsls r0, r6, 4 @@ -623097,7 +623098,7 @@ sub_8150D28: ; 8150D28 asrs r2, 16 ldr r0, =gUnknown_085CDBCC movs r3, 0x68 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r6, r0, 24 lsls r0, r6, 4 @@ -623198,7 +623199,7 @@ sub_8150D28: ; 8150D28 adds r0, r4, 0 movs r1, 0x7 @08151044: - bl obj_anim_image_start + bl StartObjectImageAnim strh r7, [r4, 0x30] ldrh r0, [r4, 0x22] adds r0, 0x2 @@ -623208,7 +623209,7 @@ sub_8150D28: ; 8150D28 adds r0, r4, 0 movs r1, 0x6 @08151056: - bl obj_anim_image_start + bl StartObjectImageAnim strh r5, [r4, 0x30] @0815105C: ldr r0, =0x02020630 @@ -623519,7 +623520,7 @@ sub_8151214: ; 8151214 mov r10, r0 str r0, [sp, 0x8] movs r0, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldrb r1, [r6] adds r2, r1, 0x1 adds r0, r2, 0 @@ -623544,7 +623545,7 @@ sub_8151214: ; 8151214 mov r0, r10 str r0, [sp, 0x8] movs r0, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 @@ -623571,7 +623572,7 @@ sub_8151214: ; 8151214 movs r0, 0 movs r1, 0 movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, [r4] ldrb r0, [r1, 0x18] cmp r0, 0 @@ -623605,7 +623606,7 @@ sub_8151214: ; 8151214 movs r0, 0 movs r1, 0 movs r2, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect @08151368: add sp, 0xC pop {r3-r5} @@ -623692,7 +623693,7 @@ sub_8151388: ; 8151388 mov r8, r0 str r0, [sp, 0x8] movs r0, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldrb r1, [r6] adds r2, r1, 0x1 adds r0, r2, 0 @@ -623717,7 +623718,7 @@ sub_8151388: ; 8151388 mov r0, r8 str r0, [sp, 0x8] movs r0, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 @@ -623744,7 +623745,7 @@ sub_8151388: ; 8151388 str r1, [sp, 0x8] movs r0, 0 movs r1, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, [r5] ldrb r0, [r1, 0x18] cmp r0, 0xA @@ -625885,7 +625886,7 @@ sub_81523F4: ; 81523F4 cmp r4, 0 beq @08152430 ldrh r0, [r4, 0x10] - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag lsls r0, 16 lsrs r5, r0, 16 ldr r0, =0x0000ffff @@ -626093,7 +626094,7 @@ sub_81524C4: ; 81524C4 ldrh r3, [r3, 0x8] strh r3, [r5, 0xA] mov r0, r8 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 4 ldrb r1, [r5, 0x5] movs r4, 0xF @@ -629148,7 +629149,7 @@ dp03_step_water_reflection: ; 8153ED4 str r0, [r7, 0x8] adds r0, r7, 0 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =gDummyObjectRotScalAnimTable str r0, [r7, 0x10] mov r1, r8 @@ -629527,7 +629528,7 @@ sub_8154228: ; 8154228 movs r1, 0 movs r2, 0 movs r3, 0x52 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 @@ -629652,7 +629653,7 @@ sub_8154298: ; 8154298 lsls r1, 24 lsrs r1, 24 adds r0, r2, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @0815432E: add sp, 0x4 pop {r3} @@ -629694,7 +629695,7 @@ oei_shadow: ; 8154340 movs r1, 0 movs r2, 0 movs r3, 0x94 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -629855,7 +629856,7 @@ oei_grass_normal: ; 81544AC movs r3, 0 ldrsh r2, [r4, r3] movs r3, 0 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -629898,7 +629899,7 @@ oei_grass_normal: ; 81544AC beq @08154538 adds r0, r3, 0 movs r1, 0x4 - bl obj_anim_image_seek + bl SeekObjectImageAnim @08154538: movs r0, 0 add sp, 0x4 @@ -630056,7 +630057,7 @@ sub_8154658: ; 8154658 movs r3, 0x4 ldrsh r2, [r4, r3] movs r3, 0 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -630193,7 +630194,7 @@ sub_8154758: ; 8154758 movs r3, 0 ldrsh r2, [r4, r3] movs r3, 0 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -630237,7 +630238,7 @@ sub_8154758: ; 8154758 beq @081547E8 adds r0, r4, 0 movs r1, 0x6 - bl obj_anim_image_seek + bl SeekObjectImageAnim @081547E8: movs r0, 0 add sp, 0x4 @@ -630387,7 +630388,7 @@ sub_81548FC: ; 81548FC movs r3, 0x4 ldrsh r2, [r4, r3] movs r3, 0 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -630445,7 +630446,7 @@ sub_815496C: ; 815496C movs r1, 0 movs r2, 0 movs r3, 0 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -630583,7 +630584,7 @@ sub_8154A10: ; 8154A10 beq @08154AB2 adds r0, r4, 0 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @08154AB2: strh r7, [r4, 0x20] strh r5, [r4, 0x22] @@ -630642,7 +630643,7 @@ sub_8154B04: ; 8154B04 movs r3, 0x4 ldrsh r2, [r4, r3] ldrb r3, [r4, 0x8] - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -630671,7 +630672,7 @@ sub_8154B04: ; 8154B04 movs r1, 0xD strh r1, [r0, 0x3C] ldrb r1, [r4, 0x10] - bl obj_anim_image_start + bl StartObjectImageAnim @08154B62: movs r0, 0 pop {r4} @@ -630696,7 +630697,7 @@ sub_8154B78: ; 8154B78 movs r3, 0x4 ldrsh r2, [r4, r3] ldrb r3, [r4, 0x8] - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r1, r0, 24 adds r5, r1, 0 @@ -630726,7 +630727,7 @@ sub_8154B78: ; 8154B78 movs r1, 0x18 strh r1, [r0, 0x3C] ldrb r1, [r4, 0x10] - bl obj_anim_image_start + bl StartObjectImageAnim @08154BD8: adds r0, r5, 0 pop {r4,r5} @@ -630751,7 +630752,7 @@ sub_8154BEC: ; 8154BEC movs r3, 0x4 ldrsh r2, [r4, r3] ldrb r3, [r4, 0x8] - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r1, r0, 24 adds r5, r1, 0 @@ -630781,7 +630782,7 @@ sub_8154BEC: ; 8154BEC movs r1, 0x23 strh r1, [r0, 0x3C] ldrb r1, [r4, 0x10] - bl obj_anim_image_start + bl StartObjectImageAnim @08154C4C: adds r0, r5, 0 pop {r4,r5} @@ -630886,7 +630887,7 @@ sub_8154CEC: ; 8154CEC movs r1, 0 movs r2, 0 movs r3, 0 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x40 @@ -631027,7 +631028,7 @@ sub_8154E1C: ; 8154E1C movs r3, 0x4 ldrsh r2, [r4, r3] movs r3, 0 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -631081,7 +631082,7 @@ oei_water_drop_tall: ; 8154E8C movs r3, 0x4 ldrsh r2, [r4, r3] movs r3, 0 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -631139,7 +631140,7 @@ sub_8154EFC: ; 8154EFC movs r1, 0 movs r2, 0 movs r3, 0 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 @@ -631191,7 +631192,7 @@ sub_8154EFC: ; 8154EFC subs r1, 0x4 strh r1, [r0, 0x26] movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim @08154F92: movs r0, 0 pop {r4-r7} @@ -631291,7 +631292,7 @@ oei_ripples: ; 8155054 movs r3, 0x4 ldrsh r2, [r4, r3] ldrb r3, [r4, 0x8] - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -631347,7 +631348,7 @@ sub_81550B4: ; 81550B4 movs r1, 0 movs r2, 0 movs r3, 0 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -631498,7 +631499,7 @@ sub_81551F0: ; 81551F0 movs r3, 0x4 ldrsh r2, [r4, r3] ldrb r3, [r4, 0x8] - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -631550,7 +631551,7 @@ sub_815525C: ; 815525C movs r3, 0x4 ldrsh r2, [r4, r3] ldrb r3, [r4, 0x8] - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -631602,7 +631603,7 @@ sub_81552C8: ; 81552C8 movs r3, 0x4 ldrsh r2, [r4, r3] ldrb r3, [r4, 0x8] - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -631654,7 +631655,7 @@ sub_8155334: ; 8155334 movs r3, 0x4 ldrsh r2, [r4, r3] ldrb r3, [r4, 0x8] - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -631743,7 +631744,7 @@ oei_ash: ; 81553D4 movs r3, 0 ldrsh r2, [r4, r3] ldrb r3, [r5, 0x8] - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -631914,7 +631915,7 @@ sub_8155534: ; 8155534 movs r3, 0x4 ldrsh r2, [r4, r3] movs r3, 0x96 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 @@ -632117,7 +632118,7 @@ sub_81556B0: ; 81556B0 add r0, sp ldrb r1, [r0] adds r0, r4, 0 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent @081556DC: add sp, 0xC pop {r4,r5} @@ -632286,7 +632287,7 @@ sub_8155800: ; 8155800 movs r1, 0 movs r2, 0 movs r3, 0xFF - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 lsls r2, r0, 4 @@ -632366,7 +632367,7 @@ sub_8155890: ; 8155890 movs r3, 0x4 ldrsh r2, [r4, r3] movs r3, 0 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -632424,7 +632425,7 @@ sub_8155900: ; 8155900 movs r1, 0 movs r2, 0 movs r3, 0 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x40 @@ -632483,7 +632484,7 @@ sub_8155900: ; 8155900 subs r1, 0x2 strh r1, [r0, 0x26] movs r1, 0x2 - bl obj_anim_image_seek + bl SeekObjectImageAnim @081559A4: movs r0, 0 pop {r4-r7} @@ -632561,7 +632562,7 @@ sub_81559BC: ; 81559BC beq @08155A46 adds r0, r4, 0 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @08155A46: strh r6, [r4, 0x20] strh r5, [r4, 0x22] @@ -632611,7 +632612,7 @@ sub_8155A88: ; 8155A88 movs r3, 0x4 ldrsh r2, [r4, r3] movs r3, 0x52 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -632691,7 +632692,7 @@ sub_8155B2C: ; 8155B2C movs r3, 0x4 ldrsh r2, [r4, r3] ldrb r3, [r4, 0x8] - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -632803,7 +632804,7 @@ ShowDisguiseFieldEffect: ; 8155BD0 movs r1, 0 movs r2, 0 movs r3, 0 - bl obj_add_from_template_backward_search + bl AddObjectToBack mov r1, sp strb r0, [r1] lsls r0, 24 @@ -632946,7 +632947,7 @@ sub_8155C88: ; 8155C88 strh r0, [r5, 0x2E] adds r0, r5, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim @08155D38: movs r3, 0x2E ldrsh r0, [r5, r3] @@ -633062,7 +633063,7 @@ sub_8155DDC: ; 8155DDC movs r3, 0x4 ldrsh r2, [r4, r3] movs r3, 0x52 - bl obj_add_from_template_backward_search + bl AddObjectToBack lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -640549,7 +640550,7 @@ sub_8159800: ; 8159800 asrs r2, 16 movs r1, 0x50 movs r3, 0x1E - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r6, =0x020241e4 ldrb r1, [r5] adds r1, r6 @@ -643567,7 +643568,7 @@ sub_815B054: ; 815B054 subs r3, r4 lsls r3, 24 lsrs r3, 24 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r4, r0, 24 movs r0, 0x40 @@ -643700,7 +643701,7 @@ sub_815B054: ; 815B054 movs r1, 0x2 str r2, [sp] str r3, [sp, 0x4] - bl obj_anim_image_start + bl StartObjectImageAnim mov r0, r8 adds r1, r4, r0 ldr r0, =sub_815B23C @@ -643766,7 +643767,7 @@ sub_815B23C: ; 815B23C subs r0, 0x1 strh r0, [r1] adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0815B270: pop {r4} pop {r0} @@ -644133,7 +644134,7 @@ sub_815B4D4: ; 815B4D4 adds r3, 0x1 lsls r3, 24 lsrs r3, 24 - bl obj_add_from_template_call_callback_once + bl AddObjectAndAnimateForOneFrame @0815B54C: movs r1, 0x20 ldrsh r0, [r4, r1] @@ -644273,7 +644274,7 @@ sub_815B5D0: ; 815B5D0 cmp r0, 0x3C ble @0815B654 adds r0, r3, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0815B654: pop {r0} bx r0 @@ -645221,7 +645222,7 @@ sub_815BE04: ; 815BE04 lsls r3, 24 lsrs r3, 24 adds r0, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront mov r9, r0 mov r1, r9 lsls r1, 24 @@ -645236,7 +645237,7 @@ sub_815BE04: ; 815BE04 lsls r3, 24 lsrs r3, 24 adds r0, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront mov r8, r0 mov r1, r8 lsls r1, 24 @@ -645252,7 +645253,7 @@ sub_815BE04: ; 815BE04 adds r0, r5, 0 movs r1, 0x1 str r2, [sp] - bl obj_anim_image_start + bl StartObjectImageAnim mov r0, r8 lsls r6, r0, 4 add r6, r8 @@ -645261,7 +645262,7 @@ sub_815BE04: ; 815BE04 adds r4, r6, r1 adds r0, r4, 0 movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r1, =0x0203841e ldrh r0, [r1] strh r0, [r5, 0x30] @@ -645429,14 +645430,14 @@ sub_815BFF4: ; 815BFF4 cmp r0, r2 bne @0815C040 adds r0, r3, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0x3C ldrsh r1, [r4, r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r4, 0 bl move_anim_8072740 @0815C040: @@ -646235,7 +646236,7 @@ sub_815C6B0: ; 815C6B0 strh r0, [r4, 0x32] ldrb r1, [r1, 0x2] adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =sub_815C700 str r0, [r4, 0x1C] pop {r4} @@ -649128,7 +649129,7 @@ sub_815DDE0: ; 815DDE0 lsls r3, 24 lsrs r3, 24 ldr r0, =gUnknown_085CE76C - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -649205,7 +649206,7 @@ sub_815DEBC: ; 815DEBC subs r0, 0x1 strh r0, [r1] adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0815DF02: pop {r4} pop {r0} @@ -649400,7 +649401,7 @@ sub_815E01C: ; 815E01C @0815E09A: adds r0, r5, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0xA0 lsls r0, 2 strh r0, [r5, 0x2E] @@ -649637,7 +649638,7 @@ sub_815E20C: ; 815E20C ldrsh r2, [r3, r0] ldr r0, =gUnknown_085CE7EC movs r3, 0x23 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 @@ -649864,7 +649865,7 @@ sub_815E404: ; 815E404 subs r0, 0x1 strh r0, [r1] adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0815E43A: pop {r4} pop {r0} @@ -649971,7 +649972,7 @@ sub_815E47C: ; 815E47C adds r0, r4, 0 adds r1, r5, 0 adds r2, r6, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 strh r0, [r7, 0x26] @@ -650168,7 +650169,7 @@ sub_815E5CC: ; 815E5CC adds r0, r1 lsls r0, 2 adds r0, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0815E6BE: ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -651535,7 +651536,7 @@ sub_815F10C: ; 815F10C lsls r2, 16 asrs r2, 16 movs r3, 0x5 - bl obj_add_from_template_forward_search + bl AddObjectToFront @0815F16A: movs r0, 0x38 ldrsh r1, [r4, r0] @@ -654056,8 +654057,8 @@ sub_816058C: ; 816058C thumb_func_start sub_8160624 sub_8160624: ; 8160624 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -654112,8 +654113,8 @@ sub_8160664: ; 8160664 thumb_func_start sub_81606A0 sub_81606A0: ; 81606A0 push {r4-r6,lr} - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator bl clear_tasks bl clear_scheduled_bg_copies_to_vram ldr r6, =0x0203bc34 @@ -654138,9 +654139,9 @@ sub_81606A0: ; 81606A0 strb r0, [r4, 0x4] bl sub_8161280 ldr r0, =gUnknown_085CEBB0 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, =gUnknown_085CEBB8 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette bl sub_81610B8 ldr r0, =0x03006310 ldrh r1, [r4] @@ -654166,8 +654167,8 @@ sub_81606A0: ; 81606A0 thumb_func_start sub_8160740 sub_8160740: ; 8160740 push {r4,r5,lr} - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator bl clear_tasks bl clear_scheduled_bg_copies_to_vram ldr r5, =0x0203bc34 @@ -654195,9 +654196,9 @@ sub_8160740: ; 8160740 bl sub_81D2824 bl sub_8161280 ldr r0, =gUnknown_085CEBB0 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, =gUnknown_085CEBB8 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette bl sub_81610B8 ldr r0, =0x03006310 ldrh r1, [r4] @@ -654252,8 +654253,8 @@ sub_816082C: ; 816082C push {lr} bl sub_8160868 bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl do_scheduled_bg_tilemap_copies_to_vram bl fade_and_return_progress_probably pop {r0} @@ -654957,8 +654958,8 @@ sub_8160EA0: ; 8160EA0 bl Free movs r0, 0 str r0, [r4] - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator pop {r4} pop {r0} bx r0 @@ -655060,7 +655061,7 @@ sub_8160F50: ; 8160F50 cmp r7, 0 bne @08160FC4 movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap ldr r0, [r6] movs r1, 0x5 strb r1, [r0] @@ -655070,7 +655071,7 @@ sub_8160F50: ; 8160F50 .pool @08160FC4: movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap ldr r0, [r6] movs r2, 0 movs r1, 0x3 @@ -655211,7 +655212,7 @@ sub_81610B8: ; 81610B8 asrs r2, 16 adds r0, r5, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r2, =0x0203bc34 ldr r1, [r2] adds r1, 0x1 @@ -655244,7 +655245,7 @@ sub_81610B8: ; 81610B8 asrs r2, 16 adds r0, r7, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r6] adds r2, r4, 0 adds r2, 0x8 @@ -655261,7 +655262,7 @@ sub_81610B8: ; 81610B8 ldr r5, =0x02020630 adds r0, r5 movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim adds r4, 0x1 cmp r4, 0x7 ble @0816111C @@ -655575,7 +655576,7 @@ sub_816137C: ; 816137C lsls r0, 2 adds r0, r4 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim b @08161436 .pool @08161420: @@ -655588,7 +655589,7 @@ sub_816137C: ; 816137C lsls r0, 2 adds r0, r4 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @08161436: ldr r0, [r7] adds r0, 0x1 @@ -655644,7 +655645,7 @@ sub_816137C: ; 816137C lsls r0, 2 adds r0, r7 movs r1, 0x3 - bl obj_anim_image_start + bl StartObjectImageAnim b @081614D4 .pool @081614B8: @@ -655660,7 +655661,7 @@ sub_816137C: ; 816137C lsls r0, 2 adds r0, r7 movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim @081614D4: mov r1, r8 ldr r0, [r1] @@ -655953,7 +655954,7 @@ sub_8161724: ; 8161724 movs r1, 0 bl sub_8198070 movs r0, 0x6 - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0 bl sub_81B3054 ldr r1, =0x03005e00 @@ -664834,8 +664835,8 @@ sub_81662C0: ; 81662C0 ldr r0, [r4] ldr r0, [r0] bl _call_via_r0 - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably ldr r4, [r4] ldr r1, [r4] @@ -664859,8 +664860,8 @@ sub_81662C0: ; 81662C0 sub_8166304: ; 8166304 push {lr} bl sub_81668F8 - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r0} bx r0 @@ -664873,8 +664874,8 @@ sub_816631C: ; 816631C ldr r0, [r0] ldr r0, [r0] bl _call_via_r0 - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl RunTextPrinters bl fade_and_return_progress_probably pop {r0} @@ -664885,8 +664886,8 @@ sub_816631C: ; 816631C thumb_func_start sub_8166340 sub_8166340: ; 8166340 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram ldr r0, =0x0203bcac ldr r0, [r0] @@ -664962,8 +664963,8 @@ sub_8166380: ; 8166380 b @0816653C .pool @0816640C: - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator b @0816653C @08166416: movs r0, 0 @@ -665075,9 +665076,9 @@ sub_8166380: ; 8166380 .pool @08166528: movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 movs r1, 0x1 bl sub_8167BA0 @@ -665860,20 +665861,20 @@ sub_8166BEC: ; 8166BEC lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x6 bls @08166C70 movs r0, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0x1 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag movs r0, 0x1 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag movs r4, 0 @08166CAE: ldr r0, [r5] @@ -665882,7 +665883,7 @@ sub_8166BEC: ; 8166BEC adds r0, r2 adds r0, r1 ldr r0, [r0] - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -665901,7 +665902,7 @@ sub_8166BEC: ; 8166BEC lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08166CE6: movs r0, 0 bl SetVBlankCallback @@ -665976,7 +665977,7 @@ sub_8166D44: ; 8166D44 movs r3, 0 bl Print movs r0, 0x2 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x2 movs r1, 0x3 bl CopyWindowToVram @@ -666017,7 +666018,7 @@ sub_8166DE4: ; 8166DE4 movs r0, 0x2 bl rbox_fill_rectangle movs r0, 0x2 - bl ClearWindowTileMap + bl ClearWindowTilemap @08166E18: lsls r0, r4, 24 asrs r0, 24 @@ -666102,7 +666103,7 @@ sub_8166E24: ; 8166E24 ldr r0, =0x02021fc4 bl sub_8166FB0 movs r0, 0x2 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x2 movs r1, 0x3 bl CopyWindowToVram @@ -666192,7 +666193,7 @@ sub_8166F50: ; 8166F50 movs r3, 0 bl Print movs r0, 0x2 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x2 movs r1, 0x3 bl CopyWindowToVram @@ -666208,7 +666209,7 @@ sub_8166F94: ; 8166F94 movs r0, 0x2 bl rbox_fill_rectangle movs r0, 0x2 - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0x2 movs r1, 0x3 bl CopyWindowToVram @@ -666680,9 +666681,9 @@ sub_8167338: ; 8167338 mov r7, r8 push {r7} ldr r0, =gUnknown_085DFD18 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, =gUnknown_085DFD20 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette ldr r2, =0x0203bc90 ldr r0, [r2] adds r0, 0x54 @@ -666710,7 +666711,7 @@ sub_8167338: ; 8167338 ldrsh r2, [r2, r0] ldr r0, =gUnknown_085DFD5C movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -666774,7 +666775,7 @@ sub_81673DC: ; 81673DC cmp r0, 0x3C ble @08167418 adds r0, r1, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, =0x0203bc90 ldr r1, [r0] adds r1, 0x54 @@ -667036,7 +667037,7 @@ sub_8167608: ; 8167608 adds r1, r0 str r1, [sp, 0x20] adds r0, r4, 0 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette ldr r1, [r7] lsls r0, 24 lsrs r0, 24 @@ -667044,7 +667045,7 @@ sub_8167608: ; 8167608 adds r1, r2 strh r0, [r1] adds r0, r5, 0 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r1, [r7] ldr r3, =0x00007b14 adds r1, r3 @@ -667053,7 +667054,7 @@ sub_8167608: ; 8167608 movs r1, 0x26 movs r2, 0x68 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 ldr r0, [r7] @@ -667063,9 +667064,9 @@ sub_8167608: ; 8167608 cmp r1, 0x40 bne @081676AC movs r0, 0x64 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0x64 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag ldr r0, [r7] add r0, r8 movs r1, 0xFF @@ -667164,9 +667165,9 @@ sub_8167760: ; 8167760 adds r2, r4, 0 bl sub_81D321C mov r0, sp - bl gpu_tile_obj_alloc_and_load_multiple + bl LoadObjectPics adds r0, r4, 0 - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes movs r4, 0 ldr r1, =0x0203bcac ldr r0, [r1] @@ -667197,7 +667198,7 @@ sub_8167760: ; 8167760 adds r0, r6, 0 movs r1, 0xE2 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 @@ -667253,7 +667254,7 @@ sub_8167760: ; 8167760 adds r0, r6, 0 movs r1, 0xE6 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 @@ -667301,7 +667302,7 @@ sub_8167760: ; 8167760 adds r0, r6, 0 movs r1, 0xDE movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 @@ -667344,9 +667345,9 @@ sub_8167760: ; 8167760 mov r1, r10 bl sub_81D32B0 mov r0, r9 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic mov r0, r10 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette add sp, 0x60 pop {r3-r5} mov r8, r3 @@ -667475,7 +667476,7 @@ sub_8167930: ; 8167930 lsls r2, 3 movs r0, 0x3 movs r3, 0 - bl LoadBgTileMap + bl LoadBgTilemap b @08167B7E .pool @08167A74: @@ -667525,7 +667526,7 @@ sub_8167930: ; 8167930 ldr r0, =0x0203bca0 ldr r1, [r0] movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r1, =gUnknown_08DCDA30 movs r0, 0xC str r0, [sp] @@ -667534,9 +667535,9 @@ sub_8167930: ; 8167930 movs r0, 0x1 movs r2, 0 movs r3, 0xD - bl CopyToBgTileMapBufferRect + bl CopyToBgTilemapBufferRect movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @08167B7E .pool @08167B1C: @@ -667557,7 +667558,7 @@ sub_8167930: ; 8167930 lsls r2, 3 movs r0, 0x2 movs r3, 0 - bl LoadBgTileMap + bl LoadBgTilemap ldr r0, =gUnknown_086231E8 movs r1, 0x30 movs r2, 0x20 @@ -668261,13 +668262,13 @@ sub_8168180: ; 8168180 bne @081681A8 adds r0, r2, 0 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim b @081681B0 .pool @081681A8: adds r0, r2, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim @081681B0: pop {r0} bx r0 @@ -668294,7 +668295,7 @@ sub_81681B4: ; 81681B4 @081681DC: movs r0, 0x66 @081681DE: - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 4 ldrb r2, [r4, 0x5] movs r1, 0xF @@ -668368,9 +668369,9 @@ sub_8168248: ; 8168248 orrs r0, r1 str r0, [sp, 0x4] mov r0, sp - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic add r0, sp, 0x8 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette add sp, 0x10 pop {r0} bx r0 @@ -668408,7 +668409,7 @@ sub_8168294: ; 8168294 mov r0, r10 asrs r2, 16 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 @@ -668427,7 +668428,7 @@ sub_8168294: ; 8168294 lsls r1, r6, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim lsls r0, r6, 2 adds r0, r7 str r4, [r0] @@ -668960,7 +668961,7 @@ sub_816864C: ; 816864C adds r0, r1 lsls r0, 2 add r0, r8 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r4, =0x03005d70 ldrb r0, [r5] adds r1, r6, 0 @@ -668996,7 +668997,7 @@ sub_816864C: ; 816864C lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r5, =0x03005d70 ldrb r1, [r4] adds r0, r1, r5 @@ -669138,9 +669139,9 @@ sub_8168818: ; 8168818 strb r4, [r0, 0x1] ldr r4, =0x000027f9 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag ldr r0, =c3_0802FDF4 movs r1, 0xA bl AddTask @@ -669308,7 +669309,7 @@ sub_8168A20: ; 8168A20 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 @@ -671527,7 +671528,7 @@ sub_8169E44: ; 8169E44 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 @@ -671567,7 +671568,7 @@ sub_8169EC8: ; 8169EC8 asrs r2, 16 movs r1, 0x50 movs r3, 0x1E - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r6, =0x020241e4 ldrb r1, [r4] adds r1, r6 @@ -671652,7 +671653,7 @@ dp01t_07_6_: ; 8169F94 asrs r2, 16 movs r1, 0x50 movs r3, 0x1E - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r6, =0x020241e4 ldrb r1, [r4] adds r1, r6 @@ -672822,9 +672823,9 @@ sub_816A90C: ; 816A90C lsls r0, 2 adds r0, r5 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =0x0000d6f8 - bl gpu_pal_alloc_new + bl AllocObjectPalette adds r4, r0, 0 lsls r4, 24 ldr r0, =gTrainerBackPicPaletteTable @@ -672972,7 +672973,7 @@ sub_816AA80: ; 816AA80 mov r0, r10 adds r1, r5, 0 adds r2, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r4, =0x020241e4 adds r4, r6, r4 strb r0, [r4] @@ -673024,7 +673025,7 @@ sub_816AA80: ; 816AA80 ldr r1, =0x020244e4 adds r6, r1 ldrb r1, [r6] - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -673510,7 +673511,7 @@ sub_816AF98: ; 816AF98 movs r1, 0 bl sub_8198070 ldrb r0, [r4, 0x8] - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r4, 0x8] bl RemoveWindow movs r0, 0 @@ -673529,7 +673530,7 @@ sub_816AF98: ; 816AF98 movs r1, 0 bl sub_8198070 ldrb r0, [r4, 0x8] - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r4, 0x8] bl RemoveWindow movs r0, 0 @@ -674096,7 +674097,7 @@ sub_816B4DC: ; 816B4DC movs r1, 0 bl sub_8198070 ldrb r0, [r4, 0x8] - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r4, 0x8] bl RemoveWindow movs r0, 0 @@ -675035,7 +675036,7 @@ sub_816BCC4: ; 816BCC4 movs r1, 0 bl sub_8198070 ldrb r0, [r4] - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram ldrb r0, [r4] @@ -675468,9 +675469,9 @@ sub_816C060: ; 816C060 bne @0816C0B2 ldr r4, =0x000013f6 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag adds r0, r4, 0 adds r1, r4, 0 adds r2, r6, 0 @@ -675513,16 +675514,16 @@ sub_816C0C8: ; 816C0C8 beq @0816C0FA ldr r4, =0x000013f6 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag ldrb r1, [r5] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0xFF strb r0, [r5] @0816C0FA: @@ -676731,8 +676732,8 @@ sub_816CBC0: ; 816CBC0 thumb_func_start sub_816CBE8 sub_816CBE8: ; 816CBE8 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram bl sub_80BA0A8 pop {r0} @@ -676743,8 +676744,8 @@ sub_816CBE8: ; 816CBE8 sub_816CC00: ; 816CC00 push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably ldr r0, =0x030022c0 ldrh r0, [r0, 0x2E] @@ -676909,8 +676910,8 @@ do_copyright_screen: ; 816CCC8 bl load_copyright_graphics bl remove_some_task bl clear_tasks - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator movs r0, 0x1 negs r0, r0 ldr r1, =0x0000ffff @@ -677166,15 +677167,15 @@ task_intro_1: ; 816CF18 movs r0, 0x8 bl SetGpuReg ldr r0, =gUnknown_085E4FDC - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085E4FEC - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085E4FFC - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes ldr r0, =gUnknown_085E4A74 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085E4A84 - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes ldr r4, =0x02037914 movs r3, 0xF0 lsls r3, 1 @@ -677467,7 +677468,7 @@ task_intro_3_3: ; 816D2A0 lsls r2, 16 asrs r2, 16 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] @@ -677512,7 +677513,7 @@ sub_816D338: ; 816D338 cmp r0, 0xC bne @0816D350 adds r0, r1, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0816D350: pop {r0} bx r0 @@ -677583,7 +677584,7 @@ task_intro_4: ; 816D354 movs r1, 0x78 movs r2, 0xA0 movs r3, 0xA - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r2, =0x02020630 @@ -677657,8 +677658,8 @@ task_intro_6: ; 816D48C bl intro_reset_and_hide_bgs movs r0, 0 bl SetVBlankCallback - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator ldr r0, =0x0203bd24 movs r1, 0 strh r1, [r0] @@ -677692,46 +677693,46 @@ task_intro_7: ; 816D4E4 cmp r0, 0 bne @0816D504 ldr r0, =gUnknown_085F52BC - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic b @0816D50A .pool @0816D504: ldr r0, =gUnknown_085F52CC - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic @0816D50A: ldr r0, =gUnknown_085F52DC - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085F52FC - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic movs r6, 0 lsls r7, r4, 2 ldr r5, =gUnknown_085E4AE8 @0816D51C: lsls r0, r6, 3 adds r0, r5 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x2 bls @0816D51C ldr r0, =gUnknown_085F530C - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes ldr r0, =gUnknown_085E4B08 - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes ldr r0, =gUnknown_085E4BDC movs r5, 0x88 lsls r5, 1 adds r1, r5, 0 movs r2, 0x80 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r0, =gUnknown_085E4BA4 movs r1, 0x90 lsls r1, 1 movs r2, 0x6E movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r0, =0x0203bcc8 ldrh r0, [r0] cmp r0, 0 @@ -677771,7 +677772,7 @@ task_intro_7: ; 816D4E4 lsls r1, 1 movs r2, 0x50 movs r3, 0x4 - bl obj_add_from_template_forward_search + bl AddObjectToFront movs r0, 0x40 negs r0, r0 movs r1, 0x3C @@ -678216,7 +678217,7 @@ sub_816D81C: ; 816D81C cmp r1, r0 bge @0816D9BA adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles b @0816D9BA @0816D99C: ldrh r0, [r4, 0x34] @@ -678308,7 +678309,7 @@ sub_816D9C0: ; 816D9C0 @0816DA50: adds r0, r4, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] @@ -678368,7 +678369,7 @@ sub_816D9C0: ; 816D9C0 adds r0, r4, 0 movs r1, 0x1 @0816DABE: - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] @@ -678449,7 +678450,7 @@ sub_816DAE8: ; 816DAE8 cmp r0, r1 bgt @0816DB60 adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles b @0816DBA4 .pool @0816DB60: @@ -678529,8 +678530,8 @@ task_intro_10: ; 816DBAC movs r2, 0 movs r3, 0 bl sub_816F2A8 - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator movs r0, 0x1 negs r0, r0 ldr r1, =0x0000ffff @@ -678663,28 +678664,28 @@ task_intro_13: ; 816DD28 cmp r0, 0 bne @0816DD94 bl intro_reset_and_hide_bgs - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator ldr r1, =0x0300301c movs r0, 0x8 strb r0, [r1] ldr r0, =gUnknown_08D88494 movs r1, 0xC0 lsls r1, 19 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D88D40 ldr r1, =0x0600c000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D89F7C ldr r1, =0x06004000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D8A818 ldr r1, =0x0600e000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08524D14 - bl gpu_tile_obj_decompress_and_load3 + bl LoadCompressedObjectPicUsingHeap ldr r0, =gUnknown_0852561C - bl gpu_pal_obj_decompress_and_apply3 + bl LoadCompressedObjectPaletteUsingHeap ldr r0, =gUnknown_08D85CD0 ldr r1, =0x02037714 movs r2, 0x80 @@ -679160,7 +679161,7 @@ sub_816E190: ; 816E190 lsrs r3, 24 ldr r0, =gUnknown_08596C10 movs r2, 0xA0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r2, r0, 4 @@ -679182,7 +679183,7 @@ sub_816E190: ; 816E190 strh r7, [r2, 0x36] ldrb r1, [r5, 0x2] adds r0, r2, 0 - bl obj_anim_image_start + bl StartObjectImageAnim adds r5, 0x6 adds r4, 0x1 cmp r4, 0x5 @@ -679293,21 +679294,21 @@ task_intro_19: ; 816E2A0 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - bl reset_all_obj_data + bl ResetAllObjectData ldr r0, =gUnknown_08D89224 movs r1, 0xC0 lsls r1, 19 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D89ABC ldr r1, =0x0600c000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D8A934 ldr r1, =0x0600e000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_085E4C88 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085E4C98 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette movs r0, 0x2 negs r0, r0 ldr r1, =0x0000ffff @@ -679797,7 +679798,7 @@ sub_816E6D4: ; 816E6D4 lsls r3, r5, 24 lsrs r3, 24 ldr r0, =gUnknown_085E4D14 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r2, r0, 4 @@ -679851,7 +679852,7 @@ sub_816E74C: ; 816E74C lsls r3, r5, 24 lsrs r3, 24 ldr r0, =gUnknown_085E4D14 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r2, r0, 4 @@ -679923,7 +679924,7 @@ sub_816E7B4: ; 816E7B4 cmp r0, 0 beq @0816E82A adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles b @0816E82A @0816E80A: subs r0, r1, 0x1 @@ -679933,7 +679934,7 @@ sub_816E7B4: ; 816E7B4 bne @0816E82A adds r0, r4, 0 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim adds r2, r4, 0 adds r2, 0x3E ldrb r1, [r2] @@ -679988,7 +679989,7 @@ sub_816E7B4: ; 816E7B4 cmp r0, 0x8C bls @0816E882 adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0816E882: pop {r4} pop {r0} @@ -680046,13 +680047,13 @@ task_intro_21: ; 816E888 movs r1, 0xC0 lsls r1, 19 adds r0, r4, 0 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r1, =0x06004000 adds r0, r4, 0 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D8B6E8 ldr r1, =0x0600e000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -680074,10 +680075,10 @@ task_intro_22: ; 816E954 lsrs r4, 24 ldr r0, =gUnknown_08D8B180 ldr r1, =0x0600c000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D8B440 ldr r1, =0x0600d000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 @@ -680234,17 +680235,17 @@ task_intro_25: ; 816EAB8 lsrs r4, 24 ldr r0, =gUnknown_08D8C16C ldr r1, =0x0600e000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D8CCC8 ldr r1, =0x0600c000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D8BA74 ldr r1, =0x06004000 - bl call_LZZUnCompVram + bl LZDecompressVram ldr r0, =gUnknown_08D8C838 movs r1, 0xC0 lsls r1, 19 - bl call_LZZUnCompVram + bl LZDecompressVram movs r1, 0xD5 lsls r1, 6 movs r0, 0 @@ -680262,9 +680263,9 @@ task_intro_25: ; 816EAB8 strh r1, [r0, 0x14] strh r2, [r0, 0x16] ldr r0, =gUnknown_085E4BF4 - bl gpu_tile_obj_decompress_and_load3 + bl LoadCompressedObjectPicUsingHeap ldr r0, =gUnknown_085E4C04 - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes pop {r4} pop {r0} bx r0 @@ -680307,12 +680308,12 @@ task_intro_26: ; 816EB44 movs r1, 0xC8 movs r2, 0x30 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r0, r4, 0 movs r1, 0xC8 movs r2, 0x50 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 lsls r0, r1, 4 @@ -680321,12 +680322,12 @@ task_intro_26: ; 816EB44 ldr r5, =0x02020630 adds r0, r5 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r4, 0 movs r1, 0xC8 movs r2, 0x70 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 lsls r0, r1, 4 @@ -680334,7 +680335,7 @@ task_intro_26: ; 816EB44 lsls r0, 2 adds r0, r5 movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r0, [r6] adds r0, 0x1 strh r0, [r6] @@ -680354,12 +680355,12 @@ task_intro_26: ; 816EB44 movs r1, 0x28 movs r2, 0x30 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r0, r4, 0 movs r1, 0x28 movs r2, 0x50 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 lsls r0, r1, 4 @@ -680368,12 +680369,12 @@ task_intro_26: ; 816EB44 ldr r5, =0x02020630 adds r0, r5 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r4, 0 movs r1, 0x28 movs r2, 0x70 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 lsls r0, r1, 4 @@ -680381,7 +680382,7 @@ task_intro_26: ; 816EB44 lsls r0, 2 adds r0, r5 movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r0, [r6] adds r0, 0x1 strh r0, [r6] @@ -680494,7 +680495,7 @@ sub_816EC6C: ; 816EC6C cmp r0, r1 bne @0816ED12 adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0816ED12: pop {r4} pop {r0} @@ -680510,9 +680511,9 @@ task_intro_27: ; 816ED20 lsls r5, 24 lsrs r5, 24 ldr r0, =gUnknown_085E5048 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085E5058 - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes movs r1, 0xD5 lsls r1, 6 movs r0, 0 @@ -680822,7 +680823,7 @@ sub_816EEA8: ; 816EEA8 movs r1, 0x78 movs r2, 0x58 movs r3, 0xF - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -681242,7 +681243,7 @@ sub_816F318: ; 816F318 str r1, [sp] movs r2, 0 movs r3, 0 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix movs r0, 0x32 ldrsh r1, [r4, r0] lsls r0, r1, 1 @@ -681277,7 +681278,7 @@ sub_816F318: ; 816F318 b @0816F39A @0816F394: adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0816F39A: add sp, 0x4 pop {r4} @@ -681316,7 +681317,7 @@ sub_816F3A4: ; 816F3A4 strh r0, [r4, 0x22] adds r0, r4, 0 movs r1, 0x3 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0x80 lsls r0, 3 strh r0, [r4, 0x32] @@ -681341,7 +681342,7 @@ sub_816F3A4: ; 816F3A4 movs r1, 0x1 movs r2, 0x3 movs r3, 0x2 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft b @0816F44C .pool @0816F420: @@ -681518,7 +681519,7 @@ sub_816F46C: ; 816F46C adds r1, r4, 0 movs r2, 0 movs r3, 0 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix ldrh r0, [r7, 0x30] adds r0, 0x1 lsls r0, 24 @@ -681531,7 +681532,7 @@ sub_816F46C: ; 816F46C str r6, [sp] mov r1, r8 mov r2, r9 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix ldrh r0, [r7, 0x30] adds r0, 0x2 lsls r0, 24 @@ -681544,7 +681545,7 @@ sub_816F46C: ; 816F46C mov r1, r8 mov r2, r9 adds r3, r5, 0 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix @0816F59E: add sp, 0x4 pop {r3-r5} @@ -681572,7 +681573,7 @@ sub_816F5B4: ; 816F5B4 str r1, [sp] movs r2, 0 movs r3, 0 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix ldrh r0, [r4, 0x30] adds r0, 0x1 lsls r0, 24 @@ -681584,7 +681585,7 @@ sub_816F5B4: ; 816F5B4 str r1, [sp] movs r2, 0 movs r3, 0 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix ldrh r0, [r4, 0x30] adds r0, 0x2 lsls r0, 24 @@ -681596,7 +681597,7 @@ sub_816F5B4: ; 816F5B4 str r1, [sp] movs r2, 0 movs r3, 0 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix ldrh r1, [r4, 0x36] movs r2, 0x36 ldrsh r0, [r4, r2] @@ -681740,7 +681741,7 @@ sub_816F6D0: ; 816F6D0 strh r0, [r4, 0x22] adds r0, r4, 0 movs r1, 0x3 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0x80 lsls r0, 3 strh r0, [r4, 0x32] @@ -681765,7 +681766,7 @@ sub_816F6D0: ; 816F6D0 movs r1, 0x1 movs r2, 0x3 movs r3, 0x2 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft @0816F744: pop {r4} pop {r0} @@ -681806,7 +681807,7 @@ sub_816F750: ; 816F750 strh r0, [r4, 0x22] adds r0, r4, 0 movs r1, 0x3 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0x80 lsls r0, 3 strh r0, [r4, 0x32] @@ -681831,7 +681832,7 @@ sub_816F750: ; 816F750 movs r1, 0x1 movs r2, 0x3 movs r3, 0x2 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft @0816F7C4: pop {r4} pop {r0} @@ -681876,7 +681877,7 @@ sub_816F7D0: ; 816F7D0 adds r1, r4, 0 adds r2, r5, 0 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 ldr r2, =0x02020630 @@ -681919,10 +681920,10 @@ sub_816F7D0: ; 816F7D0 movs r1, 0 movs r2, 0x2 movs r3, 0x2 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft adds r0, r4, 0 movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim mov r1, r8 cmp r1, 0 bne @0816F898 @@ -681952,7 +681953,7 @@ sub_816F7D0: ; 816F7D0 mov r1, r10 mov r2, r8 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 ldr r5, =0x02020630 @@ -681985,7 +681986,7 @@ sub_816F7D0: ; 816F7D0 movs r1, 0 movs r2, 0x2 movs r3, 0x2 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft ldr r2, =0x0202064c adds r4, r2 ldr r0, =sub_816F3A4 @@ -681994,7 +681995,7 @@ sub_816F7D0: ; 816F7D0 mov r1, r10 mov r2, r8 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 lsls r4, r7, 4 @@ -682010,7 +682011,7 @@ sub_816F7D0: ; 816F7D0 strh r2, [r5, 0x30] adds r0, r5, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r0, [r5, 0x1] movs r1, 0x3 orrs r0, r1 @@ -682027,7 +682028,7 @@ sub_816F7D0: ; 816F7D0 movs r1, 0 movs r2, 0x2 movs r3, 0x2 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft ldr r0, =0x0202064c adds r4, r0 ldr r1, =sub_816F3A4 @@ -682043,7 +682044,7 @@ sub_816F7D0: ; 816F7D0 adds r1, r4, 0 movs r2, 0 movs r3, 0 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix mov r0, r9 lsls r0, 24 lsrs r0, 24 @@ -682052,7 +682053,7 @@ sub_816F7D0: ; 816F7D0 adds r1, r4, 0 movs r2, 0 movs r3, 0 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix mov r1, r8 lsls r1, 24 lsrs r1, 24 @@ -682064,7 +682065,7 @@ sub_816F7D0: ; 816F7D0 adds r1, r4, 0 movs r2, 0 movs r3, 0 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix ldr r0, [sp, 0x10] add sp, 0x14 pop {r3-r5} @@ -682101,14 +682102,14 @@ sub_816F9D4: ; 816F9D4 @0816FA04: adds r0, r4, 0 movs r1, 0 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent ldrh r0, [r4, 0x20] subs r0, 0x1 b @0816FA60 @0816FA12: adds r0, r4, 0 movs r1, 0 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent ldr r0, =0x030062a0 ldr r0, [r0] movs r1, 0x7 @@ -682506,7 +682507,7 @@ sub_816FB38: ; 816FB38 cmp r0, 0 beq @0816FD38 adds r0, r6, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0816FD38: pop {r4-r6} pop {r0} @@ -682570,7 +682571,7 @@ sub_816FD44: ; 816FD44 cmp r0, 0 beq @0816FDB0 adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0816FDB0: pop {r4} pop {r0} @@ -682613,7 +682614,7 @@ sub_816FDB8: ; 816FDB8 ldr r0, =gUnknown_085E4F5C asrs r2, 16 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r6, r0, 24 lsls r4, r6, 4 @@ -682655,7 +682656,7 @@ sub_816FDB8: ; 816FDB8 adds r5, r3 ldrb r1, [r5] adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r4, 0 movs r1, 0 bl sub_8008258 @@ -682671,7 +682672,7 @@ sub_816FDB8: ; 816FDB8 asrs r2, 16 movs r1, 0x78 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r6, r0, 24 lsls r0, r6, 4 @@ -682768,7 +682769,7 @@ sub_816FEDC: ; 816FEDC adds r3, r5, 0 str r1, [sp] movs r0, 0x1 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix @0816FF48: movs r2, 0x2E ldrsh r0, [r4, r2] @@ -682794,7 +682795,7 @@ sub_816FEDC: ; 816FEDC movs r1, 0x1 movs r2, 0x3 movs r3, 0x3 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft adds r2, r4, 0 adds r2, 0x3E ldrb r1, [r2] @@ -682930,7 +682931,7 @@ sub_8170040: ; 8170040 movs r1, 0 movs r2, 0x3 movs r3, 0x3 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft movs r0, 0 strh r0, [r5, 0x30] movs r0, 0x1 @@ -682982,7 +682983,7 @@ sub_8170040: ; 8170040 movs r0, 0x12 movs r2, 0 movs r3, 0 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix add sp, 0x4 pop {r4,r5} pop {r0} @@ -683100,8 +683101,8 @@ sub_81701C4: ; 81701C4 movs r0, 0x1E movs r1, 0 bl SetGpuReg - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator movs r0, 0 bl ResetBgsAndClearDma3BusyFlags ldr r1, =gUnknown_085E5068 @@ -683128,8 +683129,8 @@ sub_81701C4: ; 81701C4 thumb_func_start sub_8170260 sub_8170260: ; 8170260 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -683139,8 +683140,8 @@ sub_8170260: ; 8170260 sub_8170274: ; 8170274 push {lr} bl sub_8170290 - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably bl do_scheduled_bg_tilemap_copies_to_vram pop {r0} @@ -683719,14 +683720,14 @@ sub_8170660: ; 8170660 lsls r0, 2 ldr r6, =0x02020630 adds r0, r6 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0xC ldrsh r1, [r5, r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r6 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0x1 movs r1, 0x1 movs r2, 0 @@ -683806,11 +683807,11 @@ sub_8170834: ; 8170834 lsls r4, 24 lsrs r4, 24 ldr r0, =0x0000d709 - bl gpu_pal_alloc_new + bl AllocObjectPalette mov r2, r9 strb r0, [r2] ldr r0, =0x0000d70a - bl gpu_pal_alloc_new + bl AllocObjectPalette strb r0, [r7] ldrb r0, [r5, 0x5] lsrs r0, 4 @@ -683934,16 +683935,16 @@ sub_817094C: ; 817094C lsls r6, 24 lsrs r6, 24 ldr r0, =0x0000d709 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag ldr r0, =0x0000d70a - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag ldr r0, =0x0000d6ff - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 ldr r0, =0x0000d704 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsls r4, 4 ldrb r2, [r5, 0x5] @@ -684040,7 +684041,7 @@ sub_8170A38: ; 8170A38 blt @08170AF8 strh r6, [r4, 0x8] ldr r0, =0x0000d709 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r2, r0, 24 movs r3, 0x1C @@ -684508,7 +684509,7 @@ sub_8170E04: ; 8170E04 movs r1, 0x20 movs r2, 0x50 movs r3, 0x1D - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 @@ -684659,7 +684660,7 @@ sub_8170F2C: ; 8170F2C movs r2, 0x50 orrs r5, r2 adds r2, r5, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 @@ -684806,7 +684807,7 @@ sub_81710A8: ; 81710A8 lsls r0, 2 adds r0, r6 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r5, 0 bl remove_task @081710F4: @@ -684862,7 +684863,7 @@ sub_8171134: ; 8171134 @08171160: adds r0, r4, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r0, [r4, 0x24] ldrh r1, [r4, 0x20] adds r0, r1 @@ -685098,7 +685099,7 @@ sub_8171240: ; 8171240 bl remove_task adds r0, r7, 0 movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0 strh r0, [r7, 0x38] ldr r0, =sub_817138C @@ -685767,7 +685768,7 @@ sub_81717F8: ; 81717F8 adds r0, r1 lsls r0, 2 adds r0, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles mov r0, r8 strh r0, [r6, 0x2E] ldr r0, =sub_81718D8 @@ -685819,7 +685820,7 @@ sub_81718D8: ; 81718D8 bl SetGpuReg ldr r0, [r4, 0x14] ldrh r0, [r0, 0x2] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 24 adds r0, 0x10 @@ -685914,7 +685915,7 @@ sub_81719C0: ; 81719C0 adds r0, r4, 0 bl obj_free_rotscale_entry adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @081719E4: pop {r4} pop {r0} @@ -685960,7 +685961,7 @@ sub_81719EC: ; 81719EC ldrsh r2, [r6, r0] ldr r0, =gUnknown_085E5250 mov r3, r8 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -685996,7 +685997,7 @@ sub_81719EC: ; 81719EC ldr r0, =gUnknown_085E51B4 ldrb r1, [r0, 0x4] adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @08171A82: adds r7, 0x1 cmp r7, 0x2 @@ -686034,7 +686035,7 @@ sub_8171AAC: ; 8171AAC cmp r0, 0 beq @08171ADC adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08171ADC: pop {r4} pop {r0} @@ -686047,7 +686048,7 @@ sub_8171AE4: ; 8171AE4 sub sp, 0x4 adds r4, r0, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r4, 0 movs r1, 0 bl sub_8008258 @@ -686112,7 +686113,7 @@ sub_8171AE4: ; 8171AE4 adds r0, r1 lsls r0, 2 adds r0, r6 - bl obj_anim_step + bl AnimateObject ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -686348,16 +686349,16 @@ sub_8171D60: ; 8171D60 lsrs r5, r0, 21 adds r4, r5, r1 ldrh r0, [r4, 0x6] - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 bne @08171D86 adds r0, r4, 0 - bl gpu_tile_obj_decompress_and_load3 + bl LoadCompressedObjectPicUsingHeap ldr r0, =gUnknown_085E50F4 adds r0, r5, r0 - bl gpu_pal_obj_decompress_and_apply3 + bl LoadCompressedObjectPaletteUsingHeap @08171D86: pop {r4,r5} pop {r0} @@ -686489,7 +686490,7 @@ sub_8171E50: ; 8171E50 lsls r0, 3 ldr r4, =gUnknown_085E51F0 adds r0, r4 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 mov r10, r0 @@ -686507,7 +686508,7 @@ sub_8171E50: ; 8171E50 adds r0, r1, r0 ldrb r1, [r0] adds r0, r7, 0 - bl obj_anim_image_start + bl StartObjectImageAnim adds r5, 0x1C adds r4, r5 ldr r0, =sub_8171F68 @@ -686680,7 +686681,7 @@ sub_8171FC4: ; 8171FC4 ldr r1, [sp] ldr r2, [sp, 0x4] ldr r3, [sp, 0xC] - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 @@ -686695,7 +686696,7 @@ sub_8171FC4: ; 8171FC4 add r0, r8 ldrb r1, [r0] adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =0x0202064c adds r4, r0 ldr r0, =sub_8172508 @@ -686798,7 +686799,7 @@ sub_81720C8: ; 81720C8 ldr r1, [sp] ldr r2, [sp, 0x4] ldr r3, [sp, 0xC] - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 @@ -686813,7 +686814,7 @@ sub_81720C8: ; 81720C8 add r0, r8 ldrb r1, [r0] adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =0x0202064c adds r4, r0 ldr r0, =sub_8172508 @@ -686916,7 +686917,7 @@ sub_81721CC: ; 81721CC ldr r1, [sp] ldr r2, [sp, 0x4] ldr r3, [sp, 0xC] - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 @@ -686930,7 +686931,7 @@ sub_81721CC: ; 81721CC mov r3, r10 ldrb r1, [r3] adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =0x0202064c adds r4, r0 ldr r0, =sub_8172508 @@ -687032,7 +687033,7 @@ sub_81722CC: ; 81722CC ldr r1, [sp] ldr r2, [sp, 0x4] ldr r3, [sp, 0xC] - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 @@ -687047,7 +687048,7 @@ sub_81722CC: ; 81722CC add r0, r8 ldrb r1, [r0] adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =0x0202064c adds r4, r0 ldr r0, =sub_8172508 @@ -687163,7 +687164,7 @@ sub_81723D4: ; 81723D4 ldr r1, [sp] ldr r2, [sp, 0x4] ldr r3, [sp, 0xC] - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 @@ -687177,7 +687178,7 @@ sub_81723D4: ; 81723D4 mov r3, r10 ldrb r1, [r3] adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =0x0202064c adds r4, r0 ldr r0, =sub_8172508 @@ -687339,7 +687340,7 @@ sub_8172560: ; 8172560 ldr r1, [sp] ldr r2, [sp, 0x4] ldr r3, [sp, 0xC] - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 @@ -687353,7 +687354,7 @@ sub_8172560: ; 8172560 mov r3, r10 ldrb r1, [r3] adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =0x0202064c adds r4, r0 ldr r0, =sub_817265C @@ -687505,7 +687506,7 @@ sub_81726BC: ; 81726BC ldr r1, [sp, 0x4] ldr r2, [sp, 0x8] ldr r3, [sp, 0x10] - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 @@ -687520,7 +687521,7 @@ sub_81726BC: ; 81726BC add r0, r9 ldrb r1, [r0] adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r1, =0x0202064c adds r4, r1 ldr r0, =sub_8172508 @@ -687639,7 +687640,7 @@ sub_81727E8: ; 81727E8 ldr r1, [sp] ldr r2, [sp, 0x4] ldr r3, [sp, 0xC] - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 @@ -687653,7 +687654,7 @@ sub_81727E8: ; 81727E8 mov r3, r10 ldrb r1, [r3] adds r0, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =0x0202064c adds r4, r0 ldr r0, =sub_81728E0 @@ -687773,7 +687774,7 @@ sub_8172944: ; 8172944 cmp r0, 0x1 bne @081729CA adds r0, r7, 0 - bl obj_delete_and_free_resources + bl RemoveObjectAndFreeResources b @081729E2 .pool @08172970: @@ -687812,9 +687813,9 @@ sub_8172944: ; 8172944 ldr r4, =gUnknown_085E50F4 @081729B4: ldrh r0, [r5, 0x6] - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag ldrh r0, [r4, 0x4] - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag adds r5, 0x8 adds r4, 0x8 adds r6, 0x1 @@ -687822,12 +687823,12 @@ sub_8172944: ; 8172944 ble @081729B4 @081729CA: adds r0, r7, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles b @081729E2 .pool @081729DC: adds r0, r7, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @081729E2: pop {r4-r7} pop {r0} @@ -688487,15 +688488,15 @@ sub_8172EF0: ; 8172EF0 cmp r0, 0 beq @08172FC8 ldr r0, =0x000027f9 - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag lsls r0, 16 lsrs r0, 16 cmp r0, r7 bne @08172F6E ldr r0, =gUnknown_0852528C - bl gpu_tile_obj_decompress_and_load3 + bl LoadCompressedObjectPicUsingHeap ldr r0, =gUnknown_08525B94 - bl gpu_pal_obj_decompress_and_apply3 + bl LoadCompressedObjectPaletteUsingHeap @08172F6E: ldr r5, =sub_8172FEC adds r0, r5, 0 @@ -688607,7 +688608,7 @@ sub_8172FEC: ; 8172FEC ldr r0, =gUnknown_085CE388 adds r1, r5, 0 movs r3, 0x5 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r5, r0, 24 b @081730D6 @@ -688620,7 +688621,7 @@ sub_8172FEC: ; 8172FEC ldr r0, =gUnknown_085CE3A0 adds r1, r5, 0 movs r3, 0x5 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r5, r0, 24 ldr r0, =0x02020630 @@ -688638,7 +688639,7 @@ sub_8172FEC: ; 8172FEC ldr r0, =gUnknown_085CE3A0 adds r1, r5, 0 movs r3, 0x5 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r5, r0, 24 ldr r0, =0x02020630 @@ -688826,7 +688827,7 @@ sub_81731FC: ; 81731FC adds r0, r4, 0 bl obj_free_rotscale_entry adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08173246: pop {r4} pop {r0} @@ -688877,7 +688878,7 @@ sub_8173250: ; 8173250 adds r0, r4, 0 bl obj_free_rotscale_entry adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @081732A6: pop {r4} pop {r0} @@ -688892,11 +688893,11 @@ sub_81732B0: ; 81732B0 lsls r4, 24 lsrs r4, 24 ldr r0, =gUnknown_085253AC - bl gpu_tile_obj_decompress_and_load3 + bl LoadCompressedObjectPicUsingHeap ldr r0, =gUnknown_08525CB4 - bl gpu_pal_obj_decompress_and_apply3 + bl LoadCompressedObjectPaletteUsingHeap ldr r0, =0x0000281d - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag adds r0, r4, 0 bl move_anim_task_del pop {r4} @@ -688913,9 +688914,9 @@ sub_81732E4: ; 81732E4 lsrs r4, 24 ldr r5, =0x0000281d adds r0, r5, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r5, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag adds r0, r4, 0 bl move_anim_task_del pop {r4,r5} @@ -689064,7 +689065,7 @@ sub_8173400: ; 8173400 lsls r0, 2 adds r0, r5 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r4, 0 bl move_anim_8072740 @08173448: @@ -689190,8 +689191,8 @@ sub_817351C: ; 817351C thumb_func_start sub_817354C sub_817354C: ; 817354C push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -689202,8 +689203,8 @@ sub_8173560: ; 8173560 push {lr} bl run_active_tasks bl RunTextPrinters - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r0} bx r0 @@ -689715,9 +689716,9 @@ sub_81739C4: ; 81739C4 cmp r0, 0 beq @08173A34 movs r0, 0x1 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0x3 - bl UnsetBgTileMap + bl UnsetBgTilemap bl FreeAllWindowBuffers ldr r5, =0x0203bcdc ldr r0, [r5] @@ -690410,7 +690411,7 @@ sub_8173F84: ; 8173F84 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0x1 movs r1, 0x2 bl sub_8174C98 @@ -690561,9 +690562,9 @@ sub_81740B0: ; 81740B0 bl HideBg bl FreeAllWindowBuffers movs r0, 0x1 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0x3 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0 bl ResetBgsAndClearDma3BusyFlags adds r0, r7, 0 @@ -690695,8 +690696,8 @@ sub_8174194: ; 8174194 .pool @08174280: bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably bl sub_80F9C1C lsls r0, 24 @@ -691463,9 +691464,9 @@ sub_81748F0: ; 81748F0 bl sub_8198314 bl FreeAllWindowBuffers movs r0, 0x1 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0x3 - bl UnsetBgTileMap + bl UnsetBgTilemap movs r0, 0 bl ResetBgsAndClearDma3BusyFlags adds r0, r6, 0 @@ -691572,7 +691573,7 @@ sub_8174A38: ; 8174A38 movs r1, 0 bl FillWindowPixelBuffer movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap ldr r4, =gUnknown_085E8B3E movs r0, 0x1 adds r1, r4, 0 @@ -691608,7 +691609,7 @@ sub_8174A88: ; 8174A88 movs r1, 0 bl FillWindowPixelBuffer movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap ldrh r0, [r7, 0x8] ldr r1, =0x000001ff ands r1, r0 @@ -691844,7 +691845,7 @@ sub_8174C98: ; 8174C98 movs r1, 0x11 bl FillWindowPixelBuffer movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap ldr r2, =0x0000021d movs r0, 0x1 movs r1, 0 @@ -692159,17 +692160,17 @@ sub_8174F70: ; 8174F70 push {lr} bl remove_some_task bl clear_tasks - bl reset_all_obj_data + bl ResetAllObjectData bl reset_temp_tile_data_buffers bl dp13_810BB8C - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator ldr r1, =0x0300301c movs r0, 0x8 strb r0, [r1] ldr r0, =gUnknown_085E5394 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085E53A4 - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette pop {r0} bx r0 .pool @@ -692188,12 +692189,12 @@ sub_8174FAC: ; 8174FAC ldr r1, [r4] adds r1, 0x12 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x00001012 adds r1, r0 movs r0, 0x3 - bl SetBgTileMap + bl SetBgTilemap movs r0, 0 movs r1, 0 movs r2, 0 @@ -692271,7 +692272,7 @@ sub_8175024: ; 8175024 movs r1, 0x1 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r4, [sp] movs r0, 0xB str r0, [sp, 0x4] @@ -692279,7 +692280,7 @@ sub_8175024: ; 8175024 movs r1, 0 movs r2, 0 movs r3, 0x3 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r4, [sp] movs r0, 0x6 str r0, [sp, 0x4] @@ -692287,18 +692288,18 @@ sub_8175024: ; 8175024 movs r1, 0x1 movs r2, 0 movs r3, 0xE - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 str r4, [sp] str r4, [sp, 0x4] movs r0, 0x3 movs r1, 0x2 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @08175108 @081750D2: bl sub_81971D0 @@ -692420,7 +692421,7 @@ sub_81751A4: ; 81751A4 cmp r0, 0x78 ble @081751BA adds r0, r5, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles b @081751F2 @081751BA: adds r0, r1, 0x1 @@ -692483,7 +692484,7 @@ sub_81751FC: ; 81751FC asrs r2, 16 adds r1, r4, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -692500,7 +692501,7 @@ sub_81751FC: ; 81751FC lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim bl GenerateRandomNumber movs r1, 0x3 ands r1, r0 @@ -692562,9 +692563,9 @@ sub_81752C0: ; 81752C0 bl sub_8152254 ldr r4, =0x000003e9 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag pop {r4} pop {r0} bx r0 @@ -692673,9 +692674,9 @@ sub_8175364: ; 8175364 strh r0, [r1] @081753B8: ldr r0, =gUnknown_085E5394 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085E53A4 - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette ldrh r0, [r6] adds r0, 0x1 strh r0, [r6] @@ -692785,8 +692786,8 @@ sub_8175364: ; 8175364 thumb_func_start sub_81754C8 sub_81754C8: ; 81754C8 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -692796,7 +692797,7 @@ sub_81754C8: ; 81754C8 sub_81754DC: ; 81754DC push {lr} bl run_active_tasks - bl call_obj_callbacks + bl CallObjectCallbacks ldr r0, =0x030022c0 ldrh r1, [r0, 0x2C] movs r0, 0x2 @@ -692820,12 +692821,12 @@ sub_81754DC: ; 81754DC bne @08175522 bl sub_81754C8 bl run_active_tasks - bl call_obj_callbacks + bl CallObjectCallbacks ldr r1, =0x0203bce5 movs r0, 0x1 strb r0, [r1] @08175522: - bl obj_sync_something + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r0} bx r0 @@ -692846,7 +692847,7 @@ sub_8175548: ; 8175548 bl AllocZeroed adds r1, r0, 0 movs r0, 0 - bl SetBgTileMap + bl SetBgTilemap ldr r0, =gUnknown_085E56F0 movs r1, 0x80 movs r2, 0x40 @@ -692855,7 +692856,7 @@ sub_8175548: ; 8175548 bl InitWindows bl DeactivateAllTextPrinters movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 movs r1, 0x3 bl CopyWindowToVram @@ -692871,7 +692872,7 @@ sub_81755A4: ; 81755A4 push {lr} bl FreeAllWindowBuffers movs r0, 0 - bl GetBgTileMap + bl GetBgTilemap cmp r0, 0 beq @081755B8 bl Free @@ -693262,9 +693263,9 @@ sub_81758E4: ; 81758E4 cmp r7, 0x1 beq @081759F0 @08175906: - bl reset_all_obj_data + bl ResetAllObjectData bl dp13_810BB8C - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator ldr r1, =0x0300301c movs r0, 0x8 strb r0, [r1] @@ -693330,9 +693331,9 @@ sub_81758E4: ; 81758E4 adds r0, r1, 0 strh r0, [r2, 0x6] adds r0, r6, 0 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, =gUnknown_085E702C - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -693496,8 +693497,8 @@ sub_8175B1C: ; 8175B1C movs r0, 0 movs r2, 0 bl sub_8176D1C - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -695419,8 +695420,8 @@ sub_8176AB0: ; 8176AB0 movs r0, 0x52 movs r1, 0 bl SetGpuReg - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator movs r0, 0x1 strb r0, [r6] b @08176C96 @@ -695446,13 +695447,13 @@ sub_8176AB0: ; 8176AB0 cmp r0, 0 bne @08176BD8 ldr r0, =gUnknown_085F5334 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085F53BC - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085F5354 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085F5384 - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes movs r0, 0x78 movs r1, 0x2E bl sub_817B834 @@ -695485,13 +695486,13 @@ sub_8176AB0: ; 8176AB0 .pool @08176BD8: ldr r0, =gUnknown_085F5344 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085F53AC - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085F5354 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085F5384 - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes movs r0, 0x78 movs r1, 0x2E bl sub_817B88C @@ -695859,7 +695860,7 @@ sub_8176EE8: ; 8176EE8 cmp r0, 0 beq @08176F04 adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles b @08176F88 .pool @08176F04: @@ -695884,7 +695885,7 @@ sub_8176EE8: ; 8176EE8 @08176F34: adds r0, r4, 0 movs r1, 0 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent b @08176F88 @08176F3E: adds r0, r4, 0 @@ -695893,17 +695894,17 @@ sub_8176EE8: ; 8176EE8 @08176F44: adds r0, r4, 0 movs r1, 0x2 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent b @08176F88 @08176F4E: adds r0, r4, 0 movs r1, 0x3 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent b @08176F88 @08176F58: adds r0, r4, 0 movs r1, 0 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent ldrh r1, [r4, 0x20] movs r2, 0x20 ldrsh r0, [r4, r2] @@ -695915,7 +695916,7 @@ sub_8176EE8: ; 8176EE8 adds r0, r4, 0 movs r1, 0 @08176F72: - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent ldrh r2, [r4, 0x20] movs r0, 0x20 ldrsh r1, [r4, r0] @@ -695942,7 +695943,7 @@ sub_8176F90: ; 8176F90 cmp r0, 0 beq @08176FAC adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles b @08177048 .pool @08176FAC: @@ -695965,7 +695966,7 @@ sub_8176F90: ; 8176F90 strh r0, [r4, 0x26] adds r0, r4, 0 movs r1, 0 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent b @08177048 @08176FD4: movs r1, 0x20 @@ -695974,12 +695975,12 @@ sub_8176F90: ; 8176F90 ble @08176FE6 adds r0, r4, 0 movs r1, 0x1 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent b @08176FEE @08176FE6: adds r0, r4, 0 movs r1, 0x2 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent @08176FEE: ldrh r2, [r4, 0x20] movs r0, 0x20 @@ -696003,7 +696004,7 @@ sub_8176F90: ; 8176F90 strh r0, [r4, 0x3C] adds r0, r4, 0 movs r1, 0 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent ldrh r1, [r4, 0x3C] movs r0, 0x3 ands r0, r1 @@ -696015,7 +696016,7 @@ sub_8176F90: ; 8176F90 @0817702E: adds r0, r4, 0 movs r1, 0 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent ldrh r2, [r4, 0x20] movs r0, 0x20 ldrsh r1, [r4, r0] @@ -696106,7 +696107,7 @@ sub_8177050: ; 8177050 adds r0, r4, 0 movs r2, 0 movs r3, 0 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix adds r2, r5, 0 adds r2, 0x3E ldrb r1, [r2] @@ -696141,7 +696142,7 @@ sub_8177050: ; 8177050 adds r0, r4, 0 movs r2, 0 movs r3, 0 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix b @0817714A @08177144: ldrh r0, [r5, 0x2E] @@ -696315,7 +696316,7 @@ sub_8177224: ; 8177224 movs r3, 0x22 ldrsh r2, [r2, r3] movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -696327,7 +696328,7 @@ sub_8177224: ; 8177224 lsls r5, 24 lsrs r5, 24 adds r1, r5, 0 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent adds r0, r4, 0 pop {r4-r7} pop {r1} @@ -696357,7 +696358,7 @@ sub_81772B8: ; 81772B8 beq @081772EC @081772DC: adds r0, r3, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles b @08177380 .pool @081772EC: @@ -697053,8 +697054,8 @@ sub_8177864: ; 8177864 thumb_func_start sub_8177874 sub_8177874: ; 8177874 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -697138,9 +697139,9 @@ sub_8177888: ; 8177888 ldr r0, [r1, 0x8] bl remove_some_task bl clear_tasks - bl reset_all_obj_data + bl ResetAllObjectData bl sub_80A1A74 - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator ldr r0, =gUnknown_085E7088 movs r1, 0 movs r2, 0x40 @@ -697168,9 +697169,9 @@ sub_8177888: ; 8177888 ldr r0, =gUnknown_085E70C8 ldr r1, =0x0203bcf0 ldr r1, [r1] - bl call_LZZUnCompWram + bl LZDecompressWram movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram bl pokedex_diploma_something movs r4, 0x1 negs r4, r4 @@ -697204,8 +697205,8 @@ sub_8177888: ; 8177888 sub_8177A08: ; 8177A08 push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r0} bx r0 @@ -697328,7 +697329,7 @@ pokedex_diploma_something: ; 8177AD4 movs r2, 0x1 bl sub_8177BCC movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 movs r1, 0x3 bl CopyWindowToVram @@ -697350,7 +697351,7 @@ sub_8177B44: ; 8177B44 ldr r0, =0x0203bcf0 ldr r1, [r0] movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap movs r1, 0x82 lsls r1, 5 movs r0, 0 @@ -697387,7 +697388,7 @@ sub_8177B9C: ; 8177B9C movs r1, 0 bl FillWindowPixelBuffer movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap pop {r0} bx r0 .pool @@ -697458,8 +697459,8 @@ sub_8177C14: ; 8177C14 sub_8177C54: ; 8177C54 push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl do_scheduled_bg_tilemap_copies_to_vram bl fade_and_return_progress_probably pop {r0} @@ -697469,8 +697470,8 @@ sub_8177C54: ; 8177C54 thumb_func_start sub_8177C70 sub_8177C70: ; 8177C70 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -697554,10 +697555,10 @@ sub_8177CB0: ; 8177CB0 b @08177DDA .pool @08177D40: - bl reset_all_obj_data + bl ResetAllObjectData b @08177DDC @08177D46: - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator b @08177DDC @08177D4C: bl sub_81221AC @@ -697663,13 +697664,13 @@ sub_8177E14: ; 8177E14 ldr r4, =0x0203bcf4 ldr r1, [r4] movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] movs r0, 0x80 lsls r0, 4 adds r1, r0 movs r0, 0x3 - bl SetBgTileMap + bl SetBgTilemap bl sub_8121E10 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram @@ -697750,7 +697751,7 @@ sub_8177E88: ; 8177E88 ldr r0, =gUnknown_08D9BF98 ldr r4, =0x0203bcf4 ldr r1, [r4] - bl call_LZZUnCompWram + bl LZDecompressWram ldr r1, [r4] b @08177FD2 .pool @@ -697760,7 +697761,7 @@ sub_8177E88: ; 8177E88 movs r2, 0x80 lsls r2, 5 adds r1, r2 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r1, [r7] ldr r0, =0x00001808 adds r1, r0 @@ -697826,7 +697827,7 @@ sub_8177E88: ; 8177E88 .pool @08177FC8: ldr r0, =gUnknown_0857FDEC - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =0x0203bcf4 ldr r1, [r0] @08177FD2: @@ -697840,7 +697841,7 @@ sub_8177E88: ; 8177E88 .pool @08177FEC: ldr r0, =gUnknown_0857FDF4 - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette movs r0, 0x1 b @08177FFE .pool @@ -697867,7 +697868,7 @@ sub_8178008: ; 8178008 @08178020: lsls r0, r4, 24 lsrs r0, 24 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -697923,7 +697924,7 @@ sub_8178090: ; 8178090 push {r4,lr} sub sp, 0x8 movs r0, 0 - bl GetBgTileMap + bl GetBgTilemap ldr r1, =0x0203bcf4 ldr r1, [r1] movs r2, 0x80 @@ -697952,7 +697953,7 @@ sub_8178090: ; 8178090 movs r3, 0x1 bl sub_817804C movs r0, 0x3 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram add sp, 0x8 @@ -698256,7 +698257,7 @@ sub_817836C: ; 817836C lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles bl sub_80D510C pop {r0} bx r0 @@ -698506,7 +698507,7 @@ sub_8178594: ; 8178594 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -698962,8 +698963,8 @@ sub_81787AC: ; 81787AC thumb_func_start sub_8178944 sub_8178944: ; 8178944 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -698990,8 +698991,8 @@ sub_8178958: ; 8178958 sub_8178974: ; 8178974 push {r4,lr} sub sp, 0x8 - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator bl clear_tasks ldr r0, =sub_8178944 bl SetVBlankCallback @@ -699024,7 +699025,7 @@ sub_8178974: ; 8178974 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0 movs r1, 0x1 movs r2, 0xD0 @@ -699043,8 +699044,8 @@ sub_8178974: ; 8178974 bl AddTask bl sub_80A2F30 bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl RunTextPrinters bl fade_and_return_progress_probably movs r0, 0 @@ -699136,7 +699137,7 @@ sub_8178A78: ; 8178A78 movs r3, 0xD bl SetWindowBorderStyle movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 movs r1, 0x3 bl CopyWindowToVram @@ -699263,7 +699264,7 @@ sub_8178A78: ; 8178A78 movs r3, 0x2 bl sub_8178EC4 movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x1 movs r1, 0x3 bl CopyWindowToVram @@ -699544,8 +699545,8 @@ sub_8178A78: ; 8178A78 strb r1, [r0] @08178E98: bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl RunTextPrinters bl fade_and_return_progress_probably add sp, 0x8 @@ -699686,8 +699687,8 @@ fullscreen_save_activate: ; 8178F90 thumb_func_start sub_8178FC8 sub_8178FC8: ; 8178FC8 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -699803,7 +699804,7 @@ sub_8178FDC: ; 8178FDC ldr r5, =0x0201e000 movs r0, 0 adds r1, r5, 0 - bl SetBgTileMap + bl SetBgTilemap mov r0, r8 str r0, [sp, 0x8] ldr r2, =0x05000200 @@ -699841,7 +699842,7 @@ sub_8178FDC: ; 8178FDC adds r2, r5, 0 bl SetWindowAttribute bl DeactivateAllTextPrinters - bl reset_all_obj_data + bl ResetAllObjectData bl clear_tasks bl sub_80A1A74 ldr r0, =gUnknown_085B0A00 @@ -700942,8 +700943,8 @@ sub_8179A04: ; 8179A04 sub_8179B68: ; 8179B68 push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl do_scheduled_bg_tilemap_copies_to_vram bl fade_and_return_progress_probably pop {r0} @@ -700953,8 +700954,8 @@ sub_8179B68: ; 8179B68 thumb_func_start sub_8179B84 sub_8179B84: ; 8179B84 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -701017,7 +701018,7 @@ sub_8179B98: ; 8179B98 b @08179D30 .pool @08179C34: - bl reset_all_obj_data + bl ResetAllObjectData ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 @@ -701025,7 +701026,7 @@ sub_8179B98: ; 8179B98 b @08179D3A .pool @08179C48: - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator b @08179D32 @08179C4E: bl init_uns_table_pokemon_copy @@ -701190,7 +701191,7 @@ sub_8179D9C: ; 8179D9C ldr r1, [r0] adds r1, 0x48 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap bl sub_8121E10 movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram @@ -701260,7 +701261,7 @@ sub_8179DF4: ; 8179DF4 ldr r1, [r1, 0x8] adds r2, r5, 0 adds r3, r4, 0 - bl help_system_enable_unless_flashback__sp199 + bl DecompressMonPic_DetectFrontOrBack_2 ldr r0, =0x0203bd18 ldr r1, [r0] b @08179F5E @@ -701283,7 +701284,7 @@ sub_8179DF4: ; 8179DF4 adds r2, r4, 0 bl sub_806E7CC adds r4, r0, 0 - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette ldrh r0, [r4, 0x4] movs r1, 0x1 bl sub_806A068 @@ -701293,21 +701294,21 @@ sub_8179DF4: ; 8179DF4 .pool @08179EC4: ldr r0, =gUnknown_085B26F4 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =0x0203bd18 ldr r1, [r0] b @08179F5E .pool @08179ED8: ldr r0, =gUnknown_085B26FC - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette ldr r0, =0x0203bd18 ldr r1, [r0] b @08179F5E .pool @08179EEC: ldr r0, =gUnknown_085F06A0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =0x0203bd18 ldr r1, [r0] b @08179F5E @@ -701317,7 +701318,7 @@ sub_8179DF4: ; 8179DF4 ldrb r0, [r0] bl sub_8179FEC ldr r0, =0x0203bd1c - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette ldr r0, =0x0203bd18 ldr r1, [r0] b @08179F5E @@ -701345,7 +701346,7 @@ sub_8179DF4: ; 8179DF4 ldr r4, =0x0203bd18 ldr r1, [r4] adds r1, 0x48 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r1, [r4] @08179F5E: ldr r0, =0x0000107e @@ -701396,7 +701397,7 @@ sub_8179FAC: ; 8179FAC movs r1, 0 bl FillWindowPixelBuffer movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram pop {r0} @@ -701714,8 +701715,8 @@ sub_817A2C0: ; 817A2C0 ands r0, r1 cmp r0, 0 bne @0817A304 - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator ldr r0, =0x03007420 ldr r1, =0x0000ffff movs r2, 0x80 @@ -701782,7 +701783,7 @@ sub_817A358: ; 817A358 movs r1, 0x30 movs r2, 0x50 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 mov r8, r0 @@ -701841,7 +701842,7 @@ sub_817A358: ; 817A358 lsls r3, 30 lsrs r3, 30 adds r0, r6, 0 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft mov r2, r9 ldr r0, [r2] ldr r1, =0x00001053 @@ -702018,7 +702019,7 @@ sub_817A56C: ; 817A56C movs r1, 0xAE movs r2, 0x54 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r2, =0x02020630 @@ -702054,7 +702055,7 @@ sub_817A5A0: ; 817A5A0 cmp r0, 0xA bne @0817A5C6 adds r0, r2, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0817A5C6: pop {r0} bx r0 @@ -703070,7 +703071,7 @@ sub_817AE00: ; 817AE00 cmp r1, r2 bls @0817AEEC bl clear_tasks - bl reset_all_obj_data + bl ResetAllObjectData movs r0, 0 bl ResetBgsAndClearDma3BusyFlags ldr r1, =gUnknown_085F06C0 @@ -703226,7 +703227,7 @@ load_intro_part2_graphics: ; 817B064 movs r2, 0x60 bl gpu_pal_apply ldr r0, =gUnknown_085F5064 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085F1668 movs r1, 0x80 lsls r1, 1 @@ -703248,7 +703249,7 @@ load_intro_part2_graphics: ; 817B064 movs r2, 0x20 bl gpu_pal_apply ldr r0, =gUnknown_085F50EC - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085F21B0 movs r1, 0x80 lsls r1, 1 @@ -703358,7 +703359,7 @@ sub_817B1C8: ; 817B1C8 movs r2, 0x60 bl gpu_pal_apply ldr r0, =gUnknown_085F5064 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085F16A8 ldr r1, =0x06010000 bl LZ77UnCompVram @@ -703382,7 +703383,7 @@ sub_817B1C8: ; 817B1C8 movs r2, 0x60 bl gpu_pal_apply ldr r0, =gUnknown_085F5064 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085F16A8 ldr r1, =0x06010000 bl LZ77UnCompVram @@ -703413,7 +703414,7 @@ sub_817B1C8: ; 817B1C8 movs r2, 0x20 bl gpu_pal_apply ldr r0, =gUnknown_085F50EC - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic movs r1, 0x80 lsls r1, 1 adds r0, r4, 0 @@ -703439,7 +703440,7 @@ sub_817B1C8: ; 817B1C8 movs r2, 0x40 bl gpu_pal_apply ldr r0, =gUnknown_085F5180 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_085F2548 movs r1, 0x80 lsls r1, 1 @@ -703770,7 +703771,7 @@ sub_817B62C: ; 817B62C cmp r0, 0 beq @0817B64C adds r0, r2, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles b @0817B690 .pool @0817B64C: @@ -703843,7 +703844,7 @@ sub_817B698: ; 817B698 ldrb r2, [r6, 0x2] ldrb r3, [r6, 0x3] ldr r0, =gUnknown_085F504C - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r5, r0, 4 @@ -703857,7 +703858,7 @@ sub_817B698: ; 817B698 lsrs r2, 6 adds r0, r4, 0 movs r3, 0 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft ldrb r3, [r4, 0x5] movs r0, 0xC orrs r3, r0 @@ -703890,7 +703891,7 @@ sub_817B698: ; 817B698 lsls r1, 28 lsrs r1, 28 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim movs r1, 0 mov r0, sp ldrh r0, [r0] @@ -704030,7 +704031,7 @@ sub_817B834: ; 817B834 adds r1, r5, 0 adds r2, r4, 0 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 @@ -704041,7 +704042,7 @@ sub_817B834: ; 817B834 adds r1, r5, 0 adds r2, r4, 0 movs r3, 0x3 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r2, =0x02020630 @@ -704070,7 +704071,7 @@ sub_817B88C: ; 817B88C adds r1, r5, 0 adds r2, r4, 0 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 @@ -704081,7 +704082,7 @@ sub_817B88C: ; 817B88C adds r1, r5, 0 adds r2, r4, 0 movs r3, 0x3 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r2, =0x02020630 @@ -704173,7 +704174,7 @@ sub_817B948: ; 817B948 adds r1, r2, 0 adds r2, r5, 0 movs r3, 0x5 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 @@ -704184,7 +704185,7 @@ sub_817B948: ; 817B948 adds r1, r4, 0 adds r2, r5, 0 movs r3, 0x6 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r5, =0x02020630 @@ -704194,7 +704195,7 @@ sub_817B948: ; 817B948 adds r0, r4, r5 strh r6, [r0, 0x2E] movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim adds r5, 0x1C adds r4, r5 ldr r0, =sub_817B8E8 @@ -704228,7 +704229,7 @@ sub_817B9C4: ; 817B9C4 adds r1, r2, 0 adds r2, r5, 0 movs r3, 0x5 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 @@ -704239,7 +704240,7 @@ sub_817B9C4: ; 817B9C4 adds r1, r4, 0 adds r2, r5, 0 movs r3, 0x6 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r5, =0x02020630 @@ -704249,7 +704250,7 @@ sub_817B9C4: ; 817B9C4 adds r0, r4, r5 strh r6, [r0, 0x2E] movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim adds r5, 0x1C adds r4, r5 ldr r0, =sub_817B8E8 @@ -704285,7 +704286,7 @@ sub_817BA44: ; 817BA44 str r1, [sp] movs r2, 0 movs r3, 0 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -704392,7 +704393,7 @@ sub_817BA7C: ; 817BA7C b @0817BB30 @0817BB2A: adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0817BB30: pop {r4} pop {r0} @@ -704408,7 +704409,7 @@ sub_817BB38: ; 817BB38 movs r1, 0x78 movs r2, 0x58 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -704496,7 +704497,7 @@ sub_817BB94: ; 817BB94 b @0817BC00 @0817BBFA: adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0817BC00: pop {r4} pop {r0} @@ -704512,7 +704513,7 @@ sub_817BC08: ; 817BC08 movs r1, 0x78 movs r2, 0x8 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -704586,7 +704587,7 @@ sub_817BC70: ; 817BC70 b @0817BCB2 @0817BCAC: adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0817BCB2: pop {r4} pop {r0} @@ -704604,7 +704605,7 @@ sub_817BCB8: ; 817BCB8 movs r1, 0x78 movs r2, 0x38 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 @@ -704749,7 +704750,7 @@ sub_817BD20: ; 817BD20 b @0817BDEA @0817BDE4: adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0817BDEA: pop {r4,r5} pop {r0} @@ -704765,7 +704766,7 @@ sub_817BDF0: ; 817BDF0 movs r1, 0x78 movs r2, 0x38 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x40 @@ -704823,9 +704824,9 @@ sub_817BDF0: ; 817BDF0 sub_817BE78: ; 817BE78 push {lr} ldr r0, =gUnknown_085F540C - bl gpu_tile_obj_decompress_and_load3 + bl LoadCompressedObjectPicUsingHeap ldr r0, =gUnknown_085F541C - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes pop {r0} bx r0 .pool @@ -705518,7 +705519,7 @@ sub_817C3A0: ; 817C3A0 movs r0, 0x1E movs r2, 0 movs r3, 0 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix movs r0, 0x10 ldrsh r1, [r6, r0] adds r0, r4, 0 @@ -705530,7 +705531,7 @@ sub_817C3A0: ; 817C3A0 movs r0, 0x1F movs r2, 0 movs r3, 0 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix ldr r1, =0x02020630 mov r9, r1 lsls r2, r5, 4 @@ -705805,7 +705806,7 @@ sub_817C560: ; 817C560 movs r0, 0x1E movs r2, 0 movs r3, 0 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix movs r3, 0x10 ldrsh r1, [r5, r3] adds r0, r4, 0 @@ -705817,7 +705818,7 @@ sub_817C560: ; 817C560 movs r0, 0x1F movs r2, 0 movs r3, 0 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix cmp r6, 0x2 bne @0817C670 ldr r0, =sub_817C510 @@ -711444,7 +711445,7 @@ sub_817F670: ; 817F670 lsls r3, 30 lsrs r3, 30 adds r0, r4, 0 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft adds r2, r4, 0 adds r2, 0x2C ldrb r0, [r2] @@ -711571,7 +711572,7 @@ sub_817F77C: ; 817F77C lsls r3, 30 lsrs r3, 30 adds r0, r4, 0 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft ldr r0, =0x03001274 ldr r0, [r0] cmp r0, 0x1 @@ -724775,8 +724776,8 @@ sub_8185E24: ; 8185E24 thumb_func_start sub_8185E8C sub_8185E8C: ; 8185E8C push {lr} - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl run_active_tasks pop {r0} bx r0 @@ -725741,7 +725742,7 @@ sub_81865C8: ; 81865C8 adds r0, r1 lsls r0, 2 adds r0, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles bl sub_81871AC @0818661A: pop {r4-r6} @@ -725980,9 +725981,9 @@ sub_8186678: ; 8186678 strb r4, [r0, 0x1] ldr r4, =0x000027f9 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag @08186816: ldr r0, =0x020244d0 ldr r0, [r0] @@ -726360,7 +726361,7 @@ sub_818686C: ; 818686C lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldrb r0, [r5] eors r4, r0 ldr r1, =0x0202406e @@ -726389,7 +726390,7 @@ sub_818686C: ; 818686C lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldrb r5, [r4] ldr r1, =0x0202406e lsls r0, r5, 1 @@ -726523,9 +726524,9 @@ sub_8186C48: ; 8186C48 strb r0, [r1, 0x1] ldr r4, =0x000027f9 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag bl sub_81871AC @08186CFA: pop {r4-r7} @@ -726635,7 +726636,7 @@ sub_8186D9C: ; 8186D9C adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldrb r0, [r6] bl sub_805EEE0 ldr r1, =0x03005d70 @@ -726873,9 +726874,9 @@ sub_8186F94: ; 8186F94 strb r0, [r1, 0x1] ldr r4, =0x000027f9 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag ldrb r0, [r5] adds r0, r6 ldrb r1, [r0] @@ -726884,7 +726885,7 @@ sub_8186F94: ; 8186F94 lsls r0, 2 adds r0, r7 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r4, =0x03005d70 ldrb r1, [r5] adds r0, r1, r4 @@ -726974,7 +726975,7 @@ sub_8187084: ; 8187084 cmp r0, 0 bne @08187120 adds r0, r3, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldrb r4, [r5] ldr r1, =0x0202406e lsls r0, r4, 1 @@ -729189,7 +729190,7 @@ sub_818843C: ; 818843C mov r0, r8 adds r1, r5, 0 adds r2, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r4, =0x020241e4 ldrb r1, [r6] adds r1, r4 @@ -729235,7 +729236,7 @@ sub_818843C: ; 818843C ldr r1, =0x020244e4 adds r2, r1 ldrb r1, [r2] - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r4, [r6] lsls r0, r4, 1 adds r0, r7 @@ -729378,7 +729379,7 @@ sub_81885D8: ; 81885D8 mov r0, r9 adds r1, r5, 0 adds r2, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r4, =0x020241e4 adds r4, r6, r4 strb r0, [r4] @@ -729430,7 +729431,7 @@ sub_81885D8: ; 81885D8 ldr r1, =0x020244e4 adds r6, r1 ldrb r1, [r6] - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -729517,7 +729518,7 @@ sub_8188768: ; 8188768 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldrb r0, [r6] bl sub_805EEE0 ldr r1, =0x03005d70 @@ -729712,7 +729713,7 @@ sub_818888C: ; 818888C adds r0, r6, 0 mov r1, r9 adds r2, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r6, =0x020241e4 ldrb r1, [r5] adds r1, r6 @@ -729741,7 +729742,7 @@ sub_818888C: ; 818888C lsls r0, r2, 3 adds r0, r1 ldrh r0, [r0, 0x4] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag ldrb r1, [r5] adds r1, r6 ldrb r1, [r1] @@ -731201,7 +731202,7 @@ sub_818962C: ; 818962C adds r0, r4, 0 bl obj_free_rotscale_entry adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles pop {r4} pop {r0} bx r0 @@ -731676,7 +731677,7 @@ sub_81899F0: ; 81899F0 adds r0, r1 lsls r0, 2 adds r0, r6 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles bl sub_818A514 @08189A40: pop {r4-r6} @@ -731880,9 +731881,9 @@ sub_8189AA0: ; 8189AA0 strb r4, [r0, 0x1] ldr r4, =0x000027f9 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag ldr r7, =0x0202406e ldrb r1, [r5] lsls r0, r1, 1 @@ -732322,7 +732323,7 @@ sub_8189D40: ; 8189D40 adds r0, r1 lsls r0, 2 adds r0, r7 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @08189FC8: ldr r1, =0x03005d7c ldr r4, =0x02024064 @@ -732334,7 +732335,7 @@ sub_8189D40: ; 8189D40 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r3, =0x020244d0 ldr r0, [r3] ldr r2, [r0, 0x8] @@ -732514,7 +732515,7 @@ sub_818A114: ; 818A114 adds r0, r1 lsls r0, 2 adds r0, r6 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, =0x03005d70 ldrb r0, [r4] adds r0, r1 @@ -732561,7 +732562,7 @@ sub_818A1B0: ; 818A1B0 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 @@ -732772,9 +732773,9 @@ sub_818A37C: ; 818A37C strb r0, [r1, 0x1] ldr r4, =0x000027f9 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag ldr r0, =c3_0802FDF4 movs r1, 0xA bl AddTask @@ -732799,7 +732800,7 @@ sub_818A37C: ; 818A37C ldr r1, =0x02020630 adds r0, r1 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r4, =0x03005d70 ldrb r1, [r7] adds r0, r1, r4 @@ -732886,7 +732887,7 @@ sub_818A470: ; 818A470 cmp r0, 0 bne @0818A4E8 adds r0, r3, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 @@ -735126,7 +735127,7 @@ sub_818B8E0: ; 818B8E0 mov r0, r8 adds r1, r5, 0 adds r2, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r4, =0x020241e4 ldrb r1, [r6] adds r1, r4 @@ -735172,7 +735173,7 @@ sub_818B8E0: ; 818B8E0 ldr r1, =0x020244e4 adds r2, r1 ldrb r1, [r2] - bl obj_anim_image_start + bl StartObjectImageAnim ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 @@ -735302,7 +735303,7 @@ sub_818BA6C: ; 818BA6C mov r0, r10 adds r1, r5, 0 adds r2, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r4, =0x020241e4 adds r4, r6, r4 strb r0, [r4] @@ -735354,7 +735355,7 @@ sub_818BA6C: ; 818BA6C ldr r1, =0x020244e4 adds r6, r1 ldrb r1, [r6] - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -735441,7 +735442,7 @@ sub_818BBE8: ; 818BBE8 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 @@ -735646,7 +735647,7 @@ sub_818BD04: ; 818BD04 mov r0, r8 mov r1, r9 adds r2, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r4, =0x020241e4 ldrb r1, [r6] adds r1, r4 @@ -735655,7 +735656,7 @@ sub_818BD04: ; 818BD04 lsls r5, 3 adds r5, r0 ldrh r0, [r5, 0x4] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag ldr r5, =0x02020630 ldrb r1, [r6] adds r1, r4 @@ -735758,7 +735759,7 @@ sub_818BD04: ; 818BD04 adds r0, r6, 0 mov r1, r8 adds r2, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r6, =0x020241e4 ldrb r1, [r5] adds r1, r6 @@ -737168,9 +737169,9 @@ sub_818CA64: ; 818CA64 lsls r0, 2 adds r0, r4 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =0x0000d6f9 - bl gpu_pal_alloc_new + bl AllocObjectPalette lsls r0, 24 lsrs r5, r0, 24 ldr r0, =0x02022fec @@ -737767,7 +737768,7 @@ load_pokemon_image_TODO: ; 818CFF4 adds r1, r5, 0 adds r2, r4, 0 adds r3, r6, 0 - bl sub_8034654 + bl DecompressMonPic b @0818D08E .pool @0818D050: @@ -737779,7 +737780,7 @@ load_pokemon_image_TODO: ; 818CFF4 adds r1, r5, 0 adds r2, r4, 0 adds r3, r6, 0 - bl sub_8034B7C + bl DecompressMonPicWithoutDuplicatingDeoxysTiles b @0818D08E .pool @0818D068: @@ -737790,7 +737791,7 @@ load_pokemon_image_TODO: ; 818CFF4 adds r0, r1 adds r1, r5, 0 adds r2, r4, 0 - bl sub_80345F0 + bl DecompressPicFromTable b @0818D08E .pool @0818D080: @@ -737799,7 +737800,7 @@ load_pokemon_image_TODO: ; 818CFF4 adds r0, r1 adds r1, r5, 0 adds r2, r7, 0 - bl sub_80345F0 + bl DecompressPicFromTable @0818D08E: movs r0, 0 add sp, 0x4 @@ -737875,7 +737876,7 @@ sub_818D0C4: ; 818D0C4 adds r1, r7, 0 mov r2, r8 bl sub_806E7CC - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette b @0818D16E .pool @0818D128: @@ -737908,7 +737909,7 @@ sub_818D0C4: ; 818D0C4 lsls r0, r6, 3 ldr r1, =gTrainerFrontPicPaletteTable adds r0, r1 - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette @0818D16E: pop {r3} mov r8, r3 @@ -738116,7 +738117,7 @@ oamt_spawn_poke_or_trainer_picture: ; 818D1EC asrs r2, r0, 16 adds r0, r5, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 adds r6, r2, 0 @@ -738383,7 +738384,7 @@ sub_818D3E4: ; 818D3E4 asrs r2, r0, 16 adds r0, r4, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 adds r6, r2, 0 @@ -738487,16 +738488,16 @@ sub_818D5B0: ; 818D5B0 adds r0, r1 ldrb r0, [r0, 0x5] lsrs r0, 4 - bl gpu_pal_tag_by_index + bl GetObjectPaletteTagBySlot lsls r0, 16 lsrs r0, 16 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag @0818D624: adds r0, r6, r4 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles mov r0, r8 bl Free adds r0, r7, 0 @@ -744116,8 +744117,8 @@ sub_8190400: ; 8190400 movs r1, 0x3F bl SetGpuReg bl sub_80A1A74 - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator ldr r1, =0x0300301c movs r0, 0x4 strb r0, [r1] @@ -744148,7 +744149,7 @@ sub_8190400: ; 8190400 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree ldr r0, =gUnknown_0860CF50 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_08D85358 movs r4, 0x80 lsls r4, 2 @@ -744256,7 +744257,7 @@ sub_8190400: ; 8190400 movs r1, 0x78 movs r2, 0x4 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 lsls r4, r7, 4 @@ -744267,13 +744268,13 @@ sub_8190400: ; 8190400 add r4, r8 adds r0, r4, 0 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim strh r6, [r4, 0x2E] adds r0, r5, 0 movs r1, 0x78 movs r2, 0x9C movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 lsls r4, r7, 4 @@ -744282,14 +744283,14 @@ sub_8190400: ; 8190400 add r4, r8 adds r0, r4, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim strh r6, [r4, 0x2E] ldr r5, =gUnknown_0860D050 adds r0, r5, 0 movs r1, 0x6 movs r2, 0x50 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 lsls r0, r7, 4 @@ -744299,7 +744300,7 @@ sub_8190400: ; 8190400 adds r4, r0, r2 adds r0, r4, 0 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim strh r6, [r4, 0x2E] movs r0, 0 strh r0, [r4, 0x30] @@ -744317,7 +744318,7 @@ sub_8190400: ; 8190400 movs r1, 0xEA movs r2, 0x50 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 lsls r4, r7, 4 @@ -744326,7 +744327,7 @@ sub_8190400: ; 8190400 add r4, r8 adds r0, r4, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim strh r6, [r4, 0x2E] movs r0, 0x1 strh r0, [r4, 0x30] @@ -748156,7 +748157,7 @@ sub_81924E0: ; 81924E0 ldr r0, [sp, 0x44] lsrs r4, r0, 24 adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0 movs r1, 0x3 bl CopyWindowToVram @@ -748246,7 +748247,7 @@ sub_81924E0: ; 81924E0 lsls r4, 24 lsrs r4, 24 adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0 movs r1, 0x3 bl CopyWindowToVram @@ -748259,7 +748260,7 @@ sub_81924E0: ; 81924E0 ble @0819288A ldr r4, [sp, 0x40] adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0 movs r1, 0x3 bl CopyWindowToVram @@ -749929,7 +749930,7 @@ sub_819314C: ; 819314C strb r0, [r1, 0x5] ldr r4, [sp, 0x6C] adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0 movs r1, 0x3 bl CopyWindowToVram @@ -749987,7 +749988,7 @@ sub_819314C: ; 819314C strb r4, [r1, 0x9] ldr r4, [sp, 0x64] adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0 movs r1, 0x3 bl CopyWindowToVram @@ -750041,7 +750042,7 @@ sub_819314C: ; 819314C strb r5, [r1, 0x9] ldr r4, [sp, 0x68] adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0 movs r1, 0x3 bl CopyWindowToVram @@ -750073,7 +750074,7 @@ sub_819314C: ; 819314C strb r5, [r1, 0x9] ldr r4, [sp, 0x60] adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0 movs r1, 0x3 bl CopyWindowToVram @@ -750235,7 +750236,7 @@ sub_819395C: ; 819395C ldr r1, =0x02020630 adds r0, r1 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim b @08193BC2 .pool @08193A00: @@ -750579,7 +750580,7 @@ sub_8193BDC: ; 8193BDC ldr r4, =0x02020630 adds r0, r4 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r2, =gUnknown_0860CBF1 lsls r1, r6, 2 add r1, r8 @@ -750594,7 +750595,7 @@ sub_8193BDC: ; 8193BDC lsls r0, 2 adds r0, r4 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 @@ -751346,8 +751347,8 @@ sub_8194220: ; 8194220 movs r1, 0x3F bl SetGpuReg bl sub_80A1A74 - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator ldr r1, =0x03005e00 mov r3, r8 lsls r0, r3, 2 @@ -751361,12 +751362,12 @@ sub_8194220: ; 8194220 adds r1, r0, 0 str r1, [r4] ldr r0, =gUnknown_08D83900 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r1, [r4] movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r1, =gUnknown_08D82F10 movs r5, 0x80 lsls r5, 6 @@ -751437,7 +751438,7 @@ sub_8194220: ; 8194220 .pool @0819447C: ldr r0, =gUnknown_0860CF50 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic mov r0, r8 lsls r0, 2 str r0, [sp, 0x1C] @@ -751451,7 +751452,7 @@ sub_8194220: ; 8194220 ldrb r2, [r4, 0x1] ldr r0, =gUnknown_0860CFA8 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r4, 0x2 adds r5, 0x1 cmp r5, 0x1E @@ -751469,7 +751470,7 @@ sub_8194220: ; 8194220 movs r1, 0xDA movs r2, 0xC movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront b @081944E8 .pool @081944DC: @@ -751477,7 +751478,7 @@ sub_8194220: ; 8194220 movs r1, 0xDA movs r2, 0xC movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront @081944E8: ldr r1, =0x00007f40 movs r0, 0 @@ -751813,11 +751814,11 @@ sub_8194220: ; 8194220 .pool @081947C8: movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x2 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 movs r1, 0x3 bl CopyWindowToVram @@ -751966,7 +751967,7 @@ sub_81948EC: ; 81948EC str r0, [sp, 0x8] movs r0, 0x1 adds r1, r5, 0 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette adds r4, 0x4 adds r5, 0x4 subs r6, 0x1 @@ -751974,7 +751975,7 @@ sub_81948EC: ; 81948EC bne @0819491A @08194938: movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0xC pop {r4-r7} pop {r0} @@ -752222,8 +752223,8 @@ sub_8194950: ; 8194950 thumb_func_start sub_8194B54 sub_8194B54: ; 8194B54 push {lr} - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl RunTextPrinters bl fade_and_return_progress_probably bl run_active_tasks @@ -752266,8 +752267,8 @@ sub_8194B70: ; 8194B70 ldrh r1, [r0] movs r0, 0x1A bl SetGpuReg - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -752394,8 +752395,8 @@ sub_8194CE4: ; 8194CE4 movs r1, 0x80 movs r2, 0x1 bl ChangeBgY - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram bl sub_80BA0A8 pop {r0} @@ -754919,7 +754920,7 @@ sub_81961F0: ; 81961F0 cmp r0, 0 bne @08196268 ldrb r0, [r4, 0x4] - bl PutWindowTileMap + bl PutWindowTilemap movs r1, 0x4 ldrsh r0, [r4, r1] movs r1, 0x9C @@ -754937,7 +754938,7 @@ sub_81961F0: ; 81961F0 movs r0, 0 movs r2, 0x1 movs r3, 0xF - bl WriteSequenceToBgTileMapBuffer + bl WriteSequenceToBgTilemapBuffer ldr r0, =sub_8196694 movs r1, 0xA bl AddTask @@ -754948,7 +754949,7 @@ sub_81961F0: ; 81961F0 movs r1, 0x2 bl CopyWindowToVram movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x1 b @0819626A .pool @@ -755131,13 +755132,13 @@ sub_8196390: ; 8196390 movs r1, 0 movs r2, 0 movs r3, 0xE - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 ldrb r0, [r4, 0xA] bl remove_task ldrb r0, [r4, 0x4] bl RemoveWindow movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x1 @081963E8: add sp, 0x8 @@ -755259,7 +755260,7 @@ sub_819645C: ; 819645C str r3, [sp, 0x4] mov r0, r9 adds r3, r4, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 adds r1, r5, 0x1 orrs r1, r7 lsls r1, 16 @@ -755277,7 +755278,7 @@ sub_819645C: ; 819645C mov r0, r9 ldr r2, [sp, 0x14] adds r3, r4, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 adds r1, r5, 0x2 orrs r1, r7 lsls r1, 16 @@ -755293,7 +755294,7 @@ sub_819645C: ; 819645C mov r0, r9 ldr r2, [sp, 0x1C] adds r3, r4, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 adds r1, r5, 0x3 orrs r1, r7 lsls r1, 16 @@ -755310,7 +755311,7 @@ sub_819645C: ; 819645C mov r0, r9 mov r2, r10 adds r3, r6, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 adds r1, r5, 0x4 orrs r1, r7 lsls r1, 16 @@ -755321,7 +755322,7 @@ sub_819645C: ; 819645C mov r0, r9 ldr r2, [sp, 0x1C] adds r3, r6, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 adds r1, r5, 0x5 orrs r1, r7 lsls r1, 16 @@ -755337,7 +755338,7 @@ sub_819645C: ; 819645C mov r0, r9 mov r2, r10 adds r3, r4, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 adds r1, r5, 0x6 orrs r1, r7 lsls r1, 16 @@ -755349,7 +755350,7 @@ sub_819645C: ; 819645C mov r0, r9 ldr r2, [sp, 0x14] adds r3, r4, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 adds r5, 0x7 orrs r5, r7 lsls r5, 16 @@ -755361,7 +755362,7 @@ sub_819645C: ; 819645C adds r1, r5, 0 ldr r2, [sp, 0x1C] adds r3, r4, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 add sp, 0x20 pop {r3-r5} mov r8, r3 @@ -755515,9 +755516,9 @@ sub_8196694: ; 8196694 movs r0, 0 movs r2, 0x1 movs r3, 0xF - bl WriteSequenceToBgTileMapBuffer + bl WriteSequenceToBgTilemapBuffer movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @081966FC: add sp, 0x10 pop {r0} @@ -757199,7 +757200,7 @@ sub_81973C4: ; 81973C4 movs r1, 0x11 bl FillWindowPixelBuffer adds r0, r5, 0 - bl PutWindowTileMap + bl PutWindowTilemap cmp r4, 0x1 bne @081973F2 adds r0, r5, 0 @@ -757227,7 +757228,7 @@ sub_81973FC: ; 81973FC movs r1, 0x11 bl FillWindowPixelBuffer adds r0, r5, 0 - bl PutWindowTileMap + bl PutWindowTilemap cmp r4, 0x1 bne @0819742A adds r0, r5, 0 @@ -757255,7 +757256,7 @@ sub_8197434: ; 8197434 movs r1, 0x11 bl FillWindowPixelBuffer adds r0, r5, 0 - bl ClearWindowTileMap + bl ClearWindowTilemap cmp r4, 0x1 bne @08197462 adds r0, r5, 0 @@ -757283,7 +757284,7 @@ sub_819746C: ; 819746C movs r1, 0x11 bl FillWindowPixelBuffer adds r0, r5, 0 - bl ClearWindowTileMap + bl ClearWindowTilemap cmp r4, 0x1 bne @0819749A adds r0, r5, 0 @@ -757339,7 +757340,7 @@ sub_81974A4: ; 81974A4 adds r0, r7, 0 adds r1, r3, 0 adds r3, r4, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x00000215 ldr r2, [sp, 0x10] str r2, [sp] @@ -757348,7 +757349,7 @@ sub_81974A4: ; 81974A4 adds r0, r7, 0 ldr r2, [sp, 0xC] adds r3, r4, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x00000216 ldr r3, [sp, 0xC] ldr r2, [sp, 0x10] @@ -757361,7 +757362,7 @@ sub_81974A4: ; 81974A4 str r6, [sp, 0x8] adds r0, r7, 0 adds r3, r4, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect mov r5, r9 ldr r0, [sp, 0x14] add r0, r9 @@ -757384,7 +757385,7 @@ sub_81974A4: ; 81974A4 ldr r3, [sp, 0x18] lsrs r2, r3, 24 adds r3, r4, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r6, [sp] str r6, [sp, 0x4] mov r0, r8 @@ -757394,7 +757395,7 @@ sub_81974A4: ; 81974A4 mov r3, r10 lsrs r2, r3, 24 adds r3, r4, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect adds r5, 0x1 ldr r0, [sp, 0x14] add r0, r9 @@ -757417,7 +757418,7 @@ sub_81974A4: ; 81974A4 str r6, [sp, 0x8] adds r0, r7, 0 adds r3, r4, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x0000021b ldr r0, [sp, 0x10] str r0, [sp] @@ -757426,7 +757427,7 @@ sub_81974A4: ; 81974A4 adds r0, r7, 0 ldr r2, [sp, 0xC] adds r3, r4, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r1, 0x87 lsls r1, 2 ldr r3, [sp, 0xC] @@ -757439,7 +757440,7 @@ sub_81974A4: ; 81974A4 str r6, [sp, 0x8] adds r0, r7, 0 adds r3, r4, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect add sp, 0x1C pop {r3-r5} mov r8, r3 @@ -757497,7 +757498,7 @@ sub_81975F4: ; 81975F4 adds r0, r6, 0 ldr r2, [sp, 0x14] adds r3, r5, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x00000203 ldr r0, [sp, 0xC] subs r0, 0x1 @@ -757510,7 +757511,7 @@ sub_81975F4: ; 81975F4 str r0, [sp, 0x8] adds r0, r6, 0 adds r3, r5, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r1, 0x81 lsls r1, 2 mov r0, r8 @@ -757525,7 +757526,7 @@ sub_81975F4: ; 81975F4 adds r0, r6, 0 ldr r2, [sp, 0xC] adds r3, r5, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x00000205 ldr r7, [sp, 0xC] add r7, r8 @@ -757539,7 +757540,7 @@ sub_81975F4: ; 81975F4 str r3, [sp, 0x8] adds r0, r6, 0 adds r3, r5, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x00000206 lsls r2, r7, 24 lsrs r7, r2, 24 @@ -757550,7 +757551,7 @@ sub_81975F4: ; 81975F4 adds r0, r6, 0 adds r2, r7, 0 adds r3, r5, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x00000207 str r4, [sp] movs r5, 0x5 @@ -757560,7 +757561,7 @@ sub_81975F4: ; 81975F4 adds r0, r6, 0 ldr r2, [sp, 0x14] mov r3, r10 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x00000209 add r8, r4 mov r3, r8 @@ -757573,7 +757574,7 @@ sub_81975F4: ; 81975F4 adds r0, r6, 0 ldr r2, [sp, 0x18] mov r3, r10 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x0000020a str r4, [sp] str r5, [sp, 0x4] @@ -757582,7 +757583,7 @@ sub_81975F4: ; 81975F4 adds r0, r6, 0 adds r2, r7, 0 mov r3, r10 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x00000a01 ldr r3, [sp, 0x10] add r10, r3 @@ -757597,7 +757598,7 @@ sub_81975F4: ; 81975F4 adds r0, r6, 0 ldr r2, [sp, 0x14] mov r3, r10 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x00000a03 str r4, [sp] str r4, [sp, 0x4] @@ -757606,7 +757607,7 @@ sub_81975F4: ; 81975F4 adds r0, r6, 0 ldr r2, [sp, 0x18] mov r3, r10 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x00000a04 ldr r0, [sp, 0x1C] str r0, [sp] @@ -757616,7 +757617,7 @@ sub_81975F4: ; 81975F4 adds r0, r6, 0 ldr r2, [sp, 0xC] mov r3, r10 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x00000a05 str r4, [sp] str r4, [sp, 0x4] @@ -757625,7 +757626,7 @@ sub_81975F4: ; 81975F4 adds r0, r6, 0 ldr r2, [sp, 0x20] mov r3, r10 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x00000a06 str r4, [sp] str r4, [sp, 0x4] @@ -757634,7 +757635,7 @@ sub_81975F4: ; 81975F4 adds r0, r6, 0 adds r2, r7, 0 mov r3, r10 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect add sp, 0x24 pop {r3-r5} mov r8, r3 @@ -757678,7 +757679,7 @@ sub_81977BC: ; 81977BC movs r1, 0 adds r2, r4, 0 adds r3, r5, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect add sp, 0xC pop {r4,r5} pop {r0} @@ -757721,7 +757722,7 @@ sub_8197804: ; 8197804 movs r1, 0 adds r2, r4, 0 adds r3, r5, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect add sp, 0xC pop {r4,r5} pop {r0} @@ -758113,11 +758114,11 @@ sub_8197AE8: ; 8197AE8 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect cmp r4, 0x1 bne @08197B12 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @08197B12: add sp, 0xC pop {r4} @@ -758144,7 +758145,7 @@ sub_8197B1C: ; 8197B1C movs r1, 0x11 bl FillWindowPixelBuffer adds r0, r5, 0 - bl PutWindowTileMap + bl PutWindowTilemap cmp r4, 0x1 bne @08197B52 adds r0, r5, 0 @@ -758179,7 +758180,7 @@ sub_8197B64: ; 8197B64 movs r1, 0x11 bl FillWindowPixelBuffer adds r0, r6, 0 - bl PutWindowTileMap + bl PutWindowTilemap cmp r4, 0x1 bne @08197BA2 adds r0, r6, 0 @@ -758242,7 +758243,7 @@ sub_8197BB4: ; 8197BB4 mov r0, r8 ldr r2, [sp, 0x14] adds r3, r5, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r0, =0x0203cd9c ldrh r1, [r0] adds r1, 0x3 @@ -758261,7 +758262,7 @@ sub_8197BB4: ; 8197BB4 mov r0, r8 ldr r2, [sp, 0x18] adds r3, r5, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r3, =0x0203cd9c ldrh r1, [r3] adds r1, 0x4 @@ -758279,7 +758280,7 @@ sub_8197BB4: ; 8197BB4 mov r0, r8 ldr r2, [sp, 0xC] adds r3, r5, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r3, =0x0203cd9c ldrh r1, [r3] adds r1, 0x5 @@ -758299,7 +758300,7 @@ sub_8197BB4: ; 8197BB4 mov r0, r8 ldr r2, [sp, 0x20] adds r3, r5, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r3, =0x0203cd9c ldrh r1, [r3] adds r1, 0x6 @@ -758315,7 +758316,7 @@ sub_8197BB4: ; 8197BB4 mov r0, r8 adds r2, r7, 0 adds r3, r5, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r3, =0x0203cd9c ldrh r1, [r3] adds r1, 0x7 @@ -758330,7 +758331,7 @@ sub_8197BB4: ; 8197BB4 mov r0, r8 ldr r2, [sp, 0x14] mov r3, r9 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r3, =0x0203cd9c ldrh r1, [r3] adds r1, 0x9 @@ -758347,7 +758348,7 @@ sub_8197BB4: ; 8197BB4 mov r0, r8 ldr r2, [sp, 0x18] mov r3, r9 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r3, =0x0203cd9c ldrh r1, [r3] adds r1, 0xA @@ -758361,7 +758362,7 @@ sub_8197BB4: ; 8197BB4 mov r0, r8 adds r2, r7, 0 mov r3, r9 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r3, =0x00000801 adds r1, r3, 0 ldr r0, =0x0203cd9c @@ -758382,7 +758383,7 @@ sub_8197BB4: ; 8197BB4 str r0, [sp, 0x8] mov r0, r8 ldr r2, [sp, 0x14] - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r3, =0x00000803 adds r1, r3, 0 ldr r0, =0x0203cd9c @@ -758398,7 +758399,7 @@ sub_8197BB4: ; 8197BB4 mov r0, r8 ldr r2, [sp, 0x18] mov r3, r9 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r3, =0x00000804 adds r1, r3, 0 ldr r0, =0x0203cd9c @@ -758415,7 +758416,7 @@ sub_8197BB4: ; 8197BB4 mov r0, r8 ldr r2, [sp, 0xC] mov r3, r9 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r0, =0x00000805 adds r1, r0, 0 ldr r2, =0x0203cd9c @@ -758431,7 +758432,7 @@ sub_8197BB4: ; 8197BB4 mov r0, r8 ldr r2, [sp, 0x20] mov r3, r9 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r0, =0x00000806 adds r1, r0, 0 ldr r2, =0x0203cd9c @@ -758447,7 +758448,7 @@ sub_8197BB4: ; 8197BB4 mov r0, r8 adds r2, r7, 0 mov r3, r9 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect add sp, 0x24 pop {r3-r5} mov r8, r3 @@ -758474,7 +758475,7 @@ sub_8197DF8: ; 8197DF8 movs r1, 0 bl FillWindowPixelBuffer adds r0, r5, 0 - bl ClearWindowTileMap + bl ClearWindowTilemap cmp r4, 0x1 bne @08197E26 adds r0, r5, 0 @@ -758522,7 +758523,7 @@ sub_8197E30: ; 8197E30 str r1, [sp, 0x8] adds r2, r4, 0 adds r3, r5, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect add sp, 0xC pop {r4,r5} pop {r0} @@ -758549,7 +758550,7 @@ SetWindowBorderStyle: ; 8197E80 movs r1, 0x11 bl FillWindowPixelBuffer adds r0, r5, 0 - bl PutWindowTileMap + bl PutWindowTilemap cmp r4, 0x1 bne @08197EB6 adds r0, r5, 0 @@ -758584,7 +758585,7 @@ sub_8197EC8: ; 8197EC8 movs r1, 0x11 bl FillWindowPixelBuffer adds r0, r6, 0 - bl PutWindowTileMap + bl PutWindowTilemap cmp r4, 0x1 bne @08197F06 adds r0, r6, 0 @@ -758642,7 +758643,7 @@ DrawWindowBorder: ; 8197F18 mov r0, r9 adds r2, r6, 0 adds r3, r4, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r2, =0x0203cd9c ldrh r1, [r2] adds r1, 0x1 @@ -758656,7 +758657,7 @@ DrawWindowBorder: ; 8197F18 mov r0, r9 ldr r2, [sp, 0xC] adds r3, r4, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r2, =0x0203cd9c ldrh r1, [r2] adds r1, 0x2 @@ -758675,7 +758676,7 @@ DrawWindowBorder: ; 8197F18 mov r0, r9 mov r2, r10 adds r3, r4, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r0, =0x0203cd9c ldrh r1, [r0] adds r1, 0x3 @@ -758689,7 +758690,7 @@ DrawWindowBorder: ; 8197F18 mov r0, r9 adds r2, r6, 0 mov r3, r8 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r0, =0x0203cd9c ldrh r1, [r0] adds r1, 0x5 @@ -758703,7 +758704,7 @@ DrawWindowBorder: ; 8197F18 mov r0, r9 mov r2, r10 mov r3, r8 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r0, =0x0203cd9c ldrh r1, [r0] adds r1, 0x6 @@ -758722,7 +758723,7 @@ DrawWindowBorder: ; 8197F18 mov r0, r9 adds r2, r6, 0 mov r3, r8 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r2, =0x0203cd9c ldrh r1, [r2] adds r1, 0x7 @@ -758736,7 +758737,7 @@ DrawWindowBorder: ; 8197F18 mov r0, r9 ldr r2, [sp, 0xC] mov r3, r8 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r2, =0x0203cd9c ldrh r1, [r2] adds r1, 0x8 @@ -758749,7 +758750,7 @@ DrawWindowBorder: ; 8197F18 mov r0, r9 mov r2, r10 mov r3, r8 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -758776,7 +758777,7 @@ sub_8198070: ; 8198070 movs r1, 0 bl FillWindowPixelBuffer adds r0, r5, 0 - bl ClearWindowTileMap + bl ClearWindowTilemap cmp r4, 0x1 bne @0819809E adds r0, r5, 0 @@ -758820,7 +758821,7 @@ sub_81980A8: ; 81980A8 str r1, [sp, 0x8] adds r2, r4, 0 adds r3, r5, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect add sp, 0xC pop {r4,r5} pop {r0} @@ -758914,7 +758915,7 @@ sub_8198180: ; 8198180 ldrb r0, [r5] cmp r0, 0xFF beq @081981EE - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r5] movs r1, 0xFF bl FillWindowPixelBuffer @@ -759002,7 +759003,7 @@ sub_8198204: ; 8198204 strb r0, [r1, 0x2] adds r5, r7, 0 ldrb r0, [r5] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r5] movs r1, 0xFF bl FillWindowPixelBuffer @@ -759108,7 +759109,7 @@ sub_8198314: ; 8198314 movs r1, 0 bl FillWindowPixelBuffer ldrb r0, [r4] - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r4] movs r1, 0x3 bl CopyWindowToVram @@ -762106,7 +762107,7 @@ do_scheduled_bg_tilemap_copies_to_vram: ; 81999D0 cmp r0, 0x1 bne @081999E4 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0 strb r0, [r4] @081999E4: @@ -762114,7 +762115,7 @@ do_scheduled_bg_tilemap_copies_to_vram: ; 81999D0 cmp r0, 0x1 bne @081999F4 movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0 strb r0, [r4, 0x1] @081999F4: @@ -762122,7 +762123,7 @@ do_scheduled_bg_tilemap_copies_to_vram: ; 81999D0 cmp r0, 0x1 bne @08199A04 movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0 strb r0, [r4, 0x2] @08199A04: @@ -762130,7 +762131,7 @@ do_scheduled_bg_tilemap_copies_to_vram: ; 81999D0 cmp r0, 0x1 bne @08199A14 movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0 strb r0, [r4, 0x3] @08199A14: @@ -762414,7 +762415,7 @@ copy_decompressed_tile_data_to_vram: ; 8199BF0 b @08199C26 @08199C20: adds r1, r4, 0 - bl LoadBgTileMap + bl LoadBgTilemap @08199C26: lsls r0, 16 lsrs r0, 16 @@ -762450,7 +762451,7 @@ sub_8199C30: ; 8199C30 lsls r2, 24 lsrs r2, 24 mov r10, r2 - bl GetBgTileMap + bl GetBgTilemap mov r8, r0 adds r0, r5, r4 cmp r5, r0 @@ -762524,7 +762525,7 @@ sub_8199CBC: ; 8199CBC lsls r4, 24 lsrs r4, 24 mov r8, r4 - bl GetBgTileMap + bl GetBgTilemap adds r7, r0, 0 movs r0, 0 cmp r0, r8 @@ -763496,7 +763497,7 @@ sub_819A44C: ; 819A44C ldrb r4, [r5, 0x5] lsrs r4, 4 movs r0, 0x65 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsls r4, 16 lsrs r4, 16 @@ -763529,24 +763530,24 @@ sub_819A44C: ; 819A44C bne @0819A4A6 adds r0, r5, 0 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0x20 strh r0, [r5, 0x2E] b @0819A4C2 @0819A4A6: adds r0, r5, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim b @0819A4C2 @0819A4B0: adds r0, r5, 0 movs r1, 0x1 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent b @0819A4C2 @0819A4BA: adds r0, r5, 0 movs r1, 0 - bl obj_anim_image_start_if_different + bl StartObjectImageAnimIfDifferent @0819A4C2: pop {r4,r5} pop {r0} @@ -763556,8 +763557,8 @@ sub_819A44C: ; 819A44C thumb_func_start sub_819A4C8 sub_819A4C8: ; 819A4C8 push {lr} - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl RunTextPrinters bl fade_and_return_progress_probably bl run_active_tasks @@ -763568,8 +763569,8 @@ sub_819A4C8: ; 819A4C8 thumb_func_start sub_819A4E4 sub_819A4E4: ; 819A4E4 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -763734,9 +763735,9 @@ sub_819A514: ; 819A514 .pool @0819A69C: bl sub_80A1A74 - bl reset_all_obj_data + bl ResetAllObjectData bl clear_tasks - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator ldr r0, =gUnknown_08DC0754 ldr r5, =0x0203ce2c ldr r1, [r5] @@ -763770,7 +763771,7 @@ sub_819A514: ; 819A514 lsls r2, 4 movs r0, 0x1 movs r3, 0 - bl LoadBgTileMap + bl LoadBgTilemap ldr r0, =gUnknown_08DC0714 movs r1, 0 movs r2, 0x40 @@ -763813,7 +763814,7 @@ sub_819A514: ; 819A514 ldr r0, =0x0203ce38 ldr r1, [r0] movs r0, 0x3 - bl SetBgTileMap + bl SetBgTilemap ldr r5, =gUnknown_0861023C movs r4, 0x8 str r4, [sp] @@ -763822,32 +763823,32 @@ sub_819A514: ; 819A514 adds r1, r5, 0 movs r2, 0xB movs r3, 0x4 - bl CopyToBgTileMapBufferRect + bl CopyToBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] movs r0, 0x3 adds r1, r5, 0 movs r2, 0x2 movs r3, 0x4 - bl CopyToBgTileMapBufferRect + bl CopyToBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] movs r0, 0x3 adds r1, r5, 0 movs r2, 0x14 movs r3, 0x4 - bl CopyToBgTileMapBufferRect + bl CopyToBgTilemapBufferRect movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @0819A8E6 .pool @0819A7CC: ldr r0, =gUnknown_086103F4 - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes ldr r0, =gUnknown_086103BC - bl gpu_tile_obj_alloc_and_load_multiple + bl LoadObjectPics ldr r0, =gUnknown_086103E4 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic movs r0, 0 bl ShowBg movs r0, 0x1 @@ -763926,7 +763927,7 @@ sub_819A514: ; 819A514 @0819A8AC: bl sub_819BCF8 movs r0, 0x5 - bl PutWindowTileMap + bl PutWindowTilemap ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 @@ -763936,7 +763937,7 @@ sub_819A514: ; 819A514 @0819A8C4: bl sub_819B9E8 movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -763947,7 +763948,7 @@ sub_819A514: ; 819A514 bl sub_819B9B4 movs r0, 0 @0819A8E2: - bl PutWindowTileMap + bl PutWindowTilemap @0819A8E6: ldr r1, =0x030022c0 movs r2, 0x87 @@ -764102,7 +764103,7 @@ sub_819AA18: ; 819AA18 ldr r0, =gUnknown_086105D8 movs r2, 0x40 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r6, =0x0300127c ldr r2, [r6] movs r5, 0x6C @@ -764141,7 +764142,7 @@ sub_819AA18: ; 819AA18 ldrsh r1, [r1, r2] movs r2, 0x58 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r6] movs r5, 0 strb r0, [r1, 0x4] @@ -764149,14 +764150,14 @@ sub_819AA18: ; 819AA18 movs r1, 0xB0 movs r2, 0x70 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r6] strb r0, [r1, 0x1] ldr r0, =gUnknown_08610620 movs r1, 0xB0 movs r2, 0x90 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r6] strb r0, [r1, 0x2] ldr r0, [r6] @@ -764236,7 +764237,7 @@ sub_819AB40: ; 819AB40 lsls r0, 2 ldr r5, =0x02020630 adds r0, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -764248,21 +764249,21 @@ sub_819AB40: ; 819AB40 adds r0, r1 lsls r0, 2 adds r0, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r6] ldrb r1, [r0, 0x1] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r6] ldrb r1, [r0, 0x2] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles pop {r4-r6} pop {r0} bx r0 @@ -764453,7 +764454,7 @@ sub_819ACE0: ; 819ACE0 cmp r0, 0 beq @0819AD60 movs r0, 0x64 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r3, r0, 24 ldr r1, [r5] @@ -764507,7 +764508,7 @@ sub_819ACE0: ; 819ACE0 .pool @0819AD60: movs r0, 0x65 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r3, r0, 24 ldr r0, [r5] @@ -764562,7 +764563,7 @@ sub_819ADAC: ; 819ADAC @0819ADCC: movs r0, 0x64 @0819ADCE: - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r3, r0, 24 ldr r2, =0x02020630 @@ -765932,7 +765933,7 @@ sub_819B958: ; 819B958 movs r1, 0x2 bl CopyWindowToVram adds r0, r4, 0 - bl ClearWindowTileMap + bl ClearWindowTilemap pop {r4,r5} pop {r0} bx r0 @@ -766100,7 +766101,7 @@ sub_819BAFC: ; 819BAFC adds r0, r1 ldrb r5, [r0, 0x10] movs r0, 0x3 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x3 movs r1, 0 bl FillWindowPixelBuffer @@ -766165,7 +766166,7 @@ sub_819BBA8: ; 819BBA8 push {r4,r5,lr} sub sp, 0xC movs r0, 0x4 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x4 movs r1, 0 bl FillWindowPixelBuffer @@ -766331,7 +766332,7 @@ sub_819BCF8: ; 819BCF8 cmp r4, 0x5 bhi @0819BD64 movs r0, 0x5 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x5 movs r1, 0 bl FillWindowPixelBuffer @@ -766483,7 +766484,7 @@ sub_819BE34: ; 819BE34 movs r1, 0x78 movs r2, 0x40 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r6, =0x0300127c ldr r1, [r6] ldr r2, =0x00000299 @@ -766880,7 +766881,7 @@ sub_819C100: ; 819C100 adds r0, r1 lsls r0, 2 adds r0, r6 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r4] ldr r1, =0x0000029d adds r0, r1 @@ -766889,9 +766890,9 @@ sub_819C100: ; 819C100 adds r0, r1 lsls r0, 2 adds r0, r6 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r5, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0819C1BA: pop {r4-r7} pop {r0} @@ -767256,7 +767257,7 @@ sub_819C4B4: ; 819C4B4 movs r1, 0x78 movs r2, 0x40 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r6, =0x0300127c ldr r1, [r6] ldr r2, =0x00000299 @@ -767267,7 +767268,7 @@ sub_819C4B4: ; 819C4B4 movs r1, 0x2C movs r2, 0x40 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r6] ldr r5, =0x00000295 adds r1, r5 @@ -767276,7 +767277,7 @@ sub_819C4B4: ; 819C4B4 movs r1, 0xC4 movs r2, 0x40 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r6] ldr r4, =0x0000029d adds r1, r4 @@ -767629,8 +767630,8 @@ sub_819C69C: ; 819C69C thumb_func_start sub_819C7E0 sub_819C7E0: ; 819C7E0 push {lr} - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl RunTextPrinters bl fade_and_return_progress_probably bl run_active_tasks @@ -767641,8 +767642,8 @@ sub_819C7E0: ; 819C7E0 thumb_func_start sub_819C7FC sub_819C7FC: ; 819C7FC push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -768914,7 +768915,7 @@ sub_819D12C: ; 819D12C cmp r0, 0x1 bne @0819D2C0 movs r0, 0x65 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag ldr r1, [r5] adds r1, 0x5 adds r1, r4 @@ -768927,7 +768928,7 @@ sub_819D12C: ; 819D12C .pool @0819D2C0: movs r0, 0x64 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag ldr r2, =0x03001284 ldr r1, [r2] adds r1, 0x5 @@ -769324,7 +769325,7 @@ sub_819D588: ; 819D588 bl gpu_pal_apply bl sub_819ED34 movs r0, 0x5 - bl PutWindowTileMap + bl PutWindowTilemap b @0819D622 .pool @0819D5F0: @@ -769674,7 +769675,7 @@ sub_819D770: ; 819D770 strh r0, [r1] bl sub_819ED34 movs r0, 0x5 - bl PutWindowTileMap + bl PutWindowTilemap ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -769708,7 +769709,7 @@ sub_819D770: ; 819D770 movs r0, 0x1 bl sub_819EDBC movs r0, 0x3 - bl PutWindowTileMap + bl PutWindowTilemap b @0819D990 @0819D936: movs r0, 0x5 @@ -770190,9 +770191,9 @@ sub_819DC1C: ; 819DC1C .pool @0819DDA8: bl sub_80A1A74 - bl reset_all_obj_data + bl ResetAllObjectData bl clear_tasks - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator bl dp13_810BB8C ldr r0, =gUnknown_08DC0754 ldr r5, =0x0203ce40 @@ -770227,7 +770228,7 @@ sub_819DC1C: ; 819DC1C lsls r2, 4 movs r0, 0x1 movs r3, 0 - bl LoadBgTileMap + bl LoadBgTilemap ldr r0, =gUnknown_08DC0714 movs r1, 0 movs r2, 0x40 @@ -770255,7 +770256,7 @@ sub_819DC1C: ; 819DC1C ldr r0, =0x0203ce4c ldr r1, [r0] movs r0, 0x3 - bl SetBgTileMap + bl SetBgTilemap ldr r1, =gUnknown_0861023C movs r0, 0x8 str r0, [sp] @@ -770263,18 +770264,18 @@ sub_819DC1C: ; 819DC1C movs r0, 0x3 movs r2, 0xB movs r3, 0x4 - bl CopyToBgTileMapBufferRect + bl CopyToBgTilemapBufferRect movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @0819E006 .pool @0819DE94: ldr r0, =gUnknown_086106B0 - bl gpu_pal_obj_alloc_and_load_multiple + bl LoadTaggedObjectPalettes ldr r0, =gUnknown_08610650 - bl gpu_tile_obj_alloc_and_load_multiple + bl LoadObjectPics ldr r0, =gUnknown_086106A0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =sub_819C7FC bl SetVBlankCallback ldr r1, =0x030022c0 @@ -770316,7 +770317,7 @@ sub_819DC1C: ; 819DC1C ldr r0, =gUnknown_085EEC73 bl sub_819EBEC movs r0, 0x2 - bl PutWindowTileMap + bl PutWindowTilemap ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -770326,7 +770327,7 @@ sub_819DC1C: ; 819DC1C @0819DF30: bl sub_819EFA8 movs r0, 0x8 - bl PutWindowTileMap + bl PutWindowTilemap b @0819E006 @0819DF3C: ldr r0, =0x03001284 @@ -770337,7 +770338,7 @@ sub_819DC1C: ; 819DC1C bl sub_819EB4C @0819DF4A: movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -770347,7 +770348,7 @@ sub_819DC1C: ; 819DC1C @0819DF64: bl sub_819EB18 movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap b @0819E006 @0819DF70: movs r0, 0x87 @@ -770366,7 +770367,7 @@ sub_819DC1C: ; 819DC1C @0819DF8C: bl sub_819ED78 movs r0, 0x3 - bl PutWindowTileMap + bl PutWindowTilemap ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -770522,7 +770523,7 @@ sub_819E0C0: ; 819E0C0 mov r0, sp movs r2, 0x40 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r4] adds r1, 0x5 adds r1, r6 @@ -770557,7 +770558,7 @@ sub_819E0C0: ; 819E0C0 ldr r0, =gUnknown_0861084C movs r2, 0x58 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] movs r4, 0 strb r0, [r1, 0x4] @@ -770565,14 +770566,14 @@ sub_819E0C0: ; 819E0C0 movs r1, 0xB0 movs r2, 0x70 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] strb r0, [r1, 0x1] ldr r0, =gUnknown_0861087C movs r1, 0xB0 movs r2, 0x90 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] strb r0, [r1, 0x2] ldr r0, [r7] @@ -770652,7 +770653,7 @@ sub_819E0C0: ; 819E0C0 movs r1, 0xF0 movs r2, 0x78 movs r3, 0xA - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] strb r0, [r1, 0x8] mov r1, sp @@ -770671,7 +770672,7 @@ sub_819E0C0: ; 819E0C0 adds r1, r4, 0 movs r2, 0x78 movs r3, 0xA - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] strb r0, [r1, 0x9] movs r5, 0x90 @@ -770680,7 +770681,7 @@ sub_819E0C0: ; 819E0C0 adds r1, r5, 0 movs r2, 0x78 movs r3, 0xA - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] strb r0, [r1, 0xA] mov r1, sp @@ -770697,7 +770698,7 @@ sub_819E0C0: ; 819E0C0 movs r1, 0xF0 movs r2, 0x78 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] strb r0, [r1, 0xB] mov r1, sp @@ -770713,7 +770714,7 @@ sub_819E0C0: ; 819E0C0 adds r1, r4, 0 movs r2, 0x78 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] strb r0, [r1, 0xC] mov r0, sp @@ -770722,7 +770723,7 @@ sub_819E0C0: ; 819E0C0 adds r1, r5, 0 movs r2, 0x78 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] strb r0, [r1, 0xD] mov r1, sp @@ -770737,7 +770738,7 @@ sub_819E0C0: ; 819E0C0 ldr r1, [sp, 0x18] movs r2, 0x90 movs r3, 0xA - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] strb r0, [r1, 0xE] mov r1, sp @@ -770754,7 +770755,7 @@ sub_819E0C0: ; 819E0C0 adds r1, r4, 0 movs r2, 0x90 movs r3, 0xA - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] strb r0, [r1, 0xF] mov r1, sp @@ -770769,7 +770770,7 @@ sub_819E0C0: ; 819E0C0 ldr r1, [sp, 0x18] movs r2, 0x90 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] strb r0, [r1, 0x10] mov r1, sp @@ -770783,7 +770784,7 @@ sub_819E0C0: ; 819E0C0 adds r1, r4, 0 movs r2, 0x90 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r7] strb r0, [r1, 0x11] movs r6, 0 @@ -771060,7 +771061,7 @@ sub_819E538: ; 819E538 lsls r0, 2 ldr r4, =0x02020630 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -771072,21 +771073,21 @@ sub_819E538: ; 819E538 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r6] ldrb r1, [r0, 0x1] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r6] ldrb r1, [r0, 0x2] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r5, 0 @0819E590: movs r4, 0 @@ -771104,7 +771105,7 @@ sub_819E538: ; 819E538 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -771132,7 +771133,7 @@ sub_819E538: ; 819E538 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -771760,7 +771761,7 @@ sub_819EA64: ; 819EA64 movs r1, 0x2 bl CopyWindowToVram adds r0, r4, 0 - bl ClearWindowTileMap + bl ClearWindowTilemap pop {r4,r5} pop {r0} bx r0 @@ -771771,7 +771772,7 @@ sub_819EA64: ; 819EA64 sub_819EAC0: ; 819EAC0 push {lr} movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x1 movs r1, 0 bl FillWindowPixelBuffer @@ -771786,7 +771787,7 @@ sub_819EAC0: ; 819EAC0 sub_819EADC: ; 819EADC push {lr} movs r0, 0x7 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x7 movs r1, 0 bl FillWindowPixelBuffer @@ -771802,7 +771803,7 @@ sub_819EAF8: ; 819EAF8 push {lr} bl sub_819EAC0 movs r0, 0x5 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x5 movs r1, 0 bl FillWindowPixelBuffer @@ -771942,7 +771943,7 @@ sub_819EC20: ; 819EC20 push {r4,r5,lr} sub sp, 0xC movs r0, 0x3 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x3 movs r1, 0 bl FillWindowPixelBuffer @@ -771990,7 +771991,7 @@ sub_819EC94: ; 819EC94 push {r4,r5,lr} sub sp, 0xC movs r0, 0x4 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x4 movs r1, 0 bl FillWindowPixelBuffer @@ -772188,7 +772189,7 @@ sub_819EE08: ; 819EE08 movs r2, 0xA bl gpu_pal_apply movs r0, 0x7 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x7 movs r1, 0 bl FillWindowPixelBuffer @@ -772354,7 +772355,7 @@ sub_819EFA8: ; 819EFA8 .pool @0819EFD0: movs r0, 0x8 - bl PutWindowTileMap + bl PutWindowTilemap ldr r0, [r6] ldrb r0, [r0, 0x14] cmp r0, 0 @@ -772708,7 +772709,7 @@ sub_819F2B4: ; 819F2B4 movs r1, 0x78 movs r2, 0x40 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront strb r0, [r4] ldr r2, =0x02020630 ldrb r1, [r4] @@ -772746,7 +772747,7 @@ sub_819F304: ; 819F304 movs r1, 0x78 movs r2, 0x40 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r6, =0x03001284 ldr r1, [r6] adds r1, 0x2D @@ -772904,7 +772905,7 @@ sub_819F444: ; 819F444 adds r0, r4 lsls r0, 2 adds r0, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0 strb r0, [r6] pop {r4-r6} @@ -773146,7 +773147,7 @@ sub_819F654: ; 819F654 bl sub_819BE20 @0819F68E: adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @0819F694: pop {r4} pop {r0} @@ -775338,7 +775339,7 @@ sub_81A0784: ; 81A0784 lsls r4, 24 lsrs r4, 24 adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0 movs r1, 0x3 bl CopyWindowToVram @@ -778223,7 +778224,7 @@ sub_81A1EA8: ; 81A1EA8 movs r3, 0x84 bl sub_81A1D78 ldrb r0, [r6] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r6] movs r1, 0x3 bl CopyWindowToVram @@ -778538,7 +778539,7 @@ sub_81A2134: ; 81A2134 bl sub_81A2008 ldr r1, =0x0203ab74 ldrb r0, [r1] - bl PutWindowTileMap + bl PutWindowTilemap ldr r1, =0x0203ab74 ldrb r0, [r1] movs r1, 0x3 @@ -778848,7 +778849,7 @@ sub_81A2460: ; 81A2460 movs r3, 0x83 bl sub_81A2358 ldrb r0, [r6] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r6] movs r1, 0x3 bl CopyWindowToVram @@ -779120,7 +779121,7 @@ sub_81A2698: ; 81A2698 movs r3, 0x40 bl sub_81A258C ldrb r0, [r6] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r6] movs r1, 0x3 bl CopyWindowToVram @@ -779380,7 +779381,7 @@ sub_81A2968: ; 81A2968 movs r3, 0x71 bl sub_81A2888 ldrb r0, [r5] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r5] movs r1, 0x3 bl CopyWindowToVram @@ -779789,7 +779790,7 @@ sub_81A2C94: ; 81A2C94 bl sub_81A2B04 mov r1, r8 ldrb r0, [r1] - bl PutWindowTileMap + bl PutWindowTilemap mov r1, r8 ldrb r0, [r1] movs r1, 0x3 @@ -780050,7 +780051,7 @@ sub_81A2F38: ; 81A2F38 movs r3, 0x71 bl sub_81A2E54 ldrb r0, [r5] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r5] movs r1, 0x3 bl CopyWindowToVram @@ -780258,7 +780259,7 @@ sub_81A2FF8: ; 81A2FF8 cmp r1, 0x4 ble @081A314A ldrb r0, [r6] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r6] movs r1, 0x3 bl CopyWindowToVram @@ -783130,7 +783131,7 @@ sub_81A4AA0: ; 81A4AA0 movs r1, 0 bl sub_81A4998 ldrb r0, [r4] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r4] movs r1, 0x3 bl CopyWindowToVram @@ -784075,7 +784076,7 @@ sub_81A5258: ; 81A5258 movs r0, 0x48 bl SetGpuReg ldr r0, =gUnknown_08611F74 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_08D855E8 movs r1, 0xF8 lsls r1, 1 @@ -784173,7 +784174,7 @@ sub_81A5258: ; 81A5258 ldr r0, =gUnknown_08611F5C movs r2, 0x54 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -784183,7 +784184,7 @@ sub_81A5258: ; 81A5258 ldr r1, =0x02020630 adds r0, r1 movs r1, 0x3 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0x80 lsls r0, 13 adds r6, r0 @@ -784283,7 +784284,7 @@ sub_81A5258: ; 81A5258 movs r3, 0xD bl sub_8056A3C movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, =0x03007420 ldr r1, =0x0000ffff movs r2, 0x80 @@ -784310,7 +784311,7 @@ sub_81A5258: ; 81A5258 bl SetGpuReg movs r0, 0xFA lsls r0, 2 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag @081A553C: movs r6, 0x1 @081A553E: @@ -784461,7 +784462,7 @@ sub_81A5558: ; 81A5558 ldr r1, [sp] mov r2, r10 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r6, r0, 24 lsls r0, r6, 4 @@ -784470,7 +784471,7 @@ sub_81A5558: ; 81A5558 ldr r1, =0x02020630 adds r0, r1 adds r1, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -784491,7 +784492,7 @@ sub_81A5698: ; 81A5698 cmp r0, 0x8 bls @081A56AA adds r0, r1, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @081A56AA: pop {r0} bx r0 @@ -785143,7 +785144,7 @@ sub_81A5BF8: ; 81A5BF8 movs r1, 0 movs r2, 0xFE movs r3, 0xE - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r6, [sp, 0x4] str r5, [sp, 0x8] @@ -785151,7 +785152,7 @@ sub_81A5BF8: ; 81A5BF8 movs r1, 0 movs r2, 0x20 movs r3, 0xE - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -785159,7 +785160,7 @@ sub_81A5BF8: ; 81A5BF8 movs r1, 0x31 movs r2, 0 movs r3, 0xE - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -785167,7 +785168,7 @@ sub_81A5BF8: ; 81A5BF8 movs r1, 0x33 movs r2, 0x1 movs r3, 0xE - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect mov r0, r8 str r0, [sp] str r4, [sp, 0x4] @@ -785176,7 +785177,7 @@ sub_81A5BF8: ; 81A5BF8 movs r1, 0x34 movs r2, 0x2 movs r3, 0xE - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r0, 0x1C mov r8, r0 str r4, [sp] @@ -785186,7 +785187,7 @@ sub_81A5BF8: ; 81A5BF8 movs r1, 0x35 movs r2, 0x1C movs r3, 0xE - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -785194,7 +785195,7 @@ sub_81A5BF8: ; 81A5BF8 movs r1, 0x36 movs r2, 0x1D movs r3, 0xE - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] movs r6, 0x5 str r6, [sp, 0x4] @@ -785203,7 +785204,7 @@ sub_81A5BF8: ; 81A5BF8 movs r1, 0x37 movs r2, 0 movs r3, 0xF - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect mov r0, r8 str r0, [sp] str r6, [sp, 0x4] @@ -785212,7 +785213,7 @@ sub_81A5BF8: ; 81A5BF8 movs r1, 0x39 movs r2, 0x1 movs r3, 0xF - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r6, [sp, 0x4] str r5, [sp, 0x8] @@ -785220,7 +785221,7 @@ sub_81A5BF8: ; 81A5BF8 movs r1, 0x3A movs r2, 0x1D movs r3, 0xF - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x00000831 str r4, [sp] str r4, [sp, 0x4] @@ -785228,7 +785229,7 @@ sub_81A5BF8: ; 81A5BF8 movs r0, 0 movs r2, 0 movs r3, 0x13 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x00000833 str r4, [sp] str r4, [sp, 0x4] @@ -785236,7 +785237,7 @@ sub_81A5BF8: ; 81A5BF8 movs r0, 0 movs r2, 0x1 movs r3, 0x13 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x00000834 movs r0, 0x1A str r0, [sp] @@ -785245,7 +785246,7 @@ sub_81A5BF8: ; 81A5BF8 movs r0, 0 movs r2, 0x2 movs r3, 0x13 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x00000835 str r4, [sp] str r4, [sp, 0x4] @@ -785253,7 +785254,7 @@ sub_81A5BF8: ; 81A5BF8 movs r0, 0 movs r2, 0x1C movs r3, 0x13 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x00000836 str r4, [sp] str r4, [sp, 0x4] @@ -785261,7 +785262,7 @@ sub_81A5BF8: ; 81A5BF8 movs r0, 0 movs r2, 0x1D movs r3, 0x13 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect add sp, 0xC pop {r3} mov r8, r3 @@ -785286,7 +785287,7 @@ sub_81A5D44: ; 81A5D44 movs r1, 0x3 movs r2, 0 movs r3, 0xE - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r6, 0x4 str r4, [sp] str r4, [sp, 0x4] @@ -785295,7 +785296,7 @@ sub_81A5D44: ; 81A5D44 movs r1, 0x4 movs r2, 0x1 movs r3, 0xE - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r0, 0x1B mov r8, r0 str r0, [sp] @@ -785305,7 +785306,7 @@ sub_81A5D44: ; 81A5D44 movs r1, 0x5 movs r2, 0x2 movs r3, 0xE - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -785313,7 +785314,7 @@ sub_81A5D44: ; 81A5D44 movs r1, 0x6 movs r2, 0x1C movs r3, 0xE - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -785321,7 +785322,7 @@ sub_81A5D44: ; 81A5D44 movs r1, 0x7 movs r2, 0x1D movs r3, 0xE - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r6, [sp, 0x4] str r5, [sp, 0x8] @@ -785329,7 +785330,7 @@ sub_81A5D44: ; 81A5D44 movs r1, 0x8 movs r2, 0 movs r3, 0xF - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r6, [sp, 0x4] str r5, [sp, 0x8] @@ -785337,7 +785338,7 @@ sub_81A5D44: ; 81A5D44 movs r1, 0x9 movs r2, 0x1 movs r3, 0xF - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect mov r0, r8 str r0, [sp] str r6, [sp, 0x4] @@ -785346,7 +785347,7 @@ sub_81A5D44: ; 81A5D44 movs r1, 0xA movs r2, 0x2 movs r3, 0xF - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r6, [sp, 0x4] str r5, [sp, 0x8] @@ -785354,7 +785355,7 @@ sub_81A5D44: ; 81A5D44 movs r1, 0xB movs r2, 0x1C movs r3, 0xF - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r6, [sp, 0x4] str r5, [sp, 0x8] @@ -785362,7 +785363,7 @@ sub_81A5D44: ; 81A5D44 movs r1, 0xC movs r2, 0x1D movs r3, 0xF - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -785370,7 +785371,7 @@ sub_81A5D44: ; 81A5D44 movs r1, 0xD movs r2, 0 movs r3, 0x13 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -785378,7 +785379,7 @@ sub_81A5D44: ; 81A5D44 movs r1, 0xE movs r2, 0x1 movs r3, 0x13 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect mov r0, r8 str r0, [sp] str r4, [sp, 0x4] @@ -785387,7 +785388,7 @@ sub_81A5D44: ; 81A5D44 movs r1, 0xF movs r2, 0x2 movs r3, 0x13 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -785395,7 +785396,7 @@ sub_81A5D44: ; 81A5D44 movs r1, 0x10 movs r2, 0x1C movs r3, 0x13 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -785403,7 +785404,7 @@ sub_81A5D44: ; 81A5D44 movs r1, 0x11 movs r2, 0x1D movs r3, 0x13 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect add sp, 0xC pop {r3} mov r8, r3 @@ -795126,8 +795127,8 @@ sub_81AAC90: ; 81AAC90 c2_bag_3: ; 81AAD5C push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl do_scheduled_bg_tilemap_copies_to_vram bl fade_and_return_progress_probably pop {r0} @@ -795137,8 +795138,8 @@ c2_bag_3: ; 81AAD5C thumb_func_start vblank_cb_bag_menu vblank_cb_bag_menu: ; 81AAD78 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -795224,7 +795225,7 @@ setup_bag_menu: ; 81AADB8 b @081AB01A .pool @081AAE50: - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator b @081AB012 @081AAE56: bl sub_80A1A74 @@ -795240,7 +795241,7 @@ setup_bag_menu: ; 81AADB8 b @081AB01A .pool @081AAE78: - bl reset_all_obj_data + bl ResetAllObjectData b @081AB012 @081AAE7E: movs r0, 0x87 @@ -795458,7 +795459,7 @@ bag_menu_init_bgs: ; 81AB050 ldr r1, [r4] adds r1, 0x4 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap bl sub_8121E10 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram @@ -795529,7 +795530,7 @@ load_bag_menu_graphics: ; 81AB0BC ldr r4, =0x0203ce54 ldr r1, [r4] adds r1, 0x4 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r1, [r4] b @081AB1B2 .pool @@ -795569,17 +795570,17 @@ load_bag_menu_graphics: ; 81AB0BC bne @081AB19C @081AB18A: ldr r0, =gUnknown_0857FB34 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic b @081AB1AE .pool @081AB19C: ldr r0, =gUnknown_0857FB3C - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic b @081AB1AE .pool @081AB1A8: ldr r0, =gUnknown_0857FB44 - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette @081AB1AE: ldr r0, =0x0203ce54 ldr r1, [r0] @@ -796482,8 +796483,8 @@ task_close_bag_menu_2: ; 81AB930 bl SetMainCallback2 @081AB98A: bl sub_81AB824 - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator bl free_bag_item_list_buffers adds r0, r5, 0 bl remove_task @@ -797117,11 +797118,11 @@ set_callback3_to_bag: ; 81ABECC bl sub_81AB7BC bl sub_81AB854 movs r0, 0x3 - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0x4 - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram ldr r1, =0x03005e00 @@ -797241,9 +797242,9 @@ sub_81ABFA8: ; 81ABFA8 cmp r2, 0 bne @081AC026 movs r0, 0 - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0x1 - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r4] ldr r3, =0x0203ce58 ldrb r2, [r3, 0x5] @@ -797339,7 +797340,7 @@ sub_81ABFA8: ; 81ABFA8 movs r1, 0xB movs r2, 0xE movs r3, 0x2 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram add r0, sp, 0x8 @@ -797488,9 +797489,9 @@ sub_81AC10C: ; 81AC10C lsrs r0, 24 strh r0, [r6] movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x2 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram bl sub_81AB7BC @@ -797521,7 +797522,7 @@ sub_81AC23C: ; 81AC23C movs r0, 0x2 movs r1, 0x11 movs r2, 0xE - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram add sp, 0x8 @@ -797548,7 +797549,7 @@ bag_menu_draw_pocket_indicator_square: ; 81AC26C str r0, [sp, 0x4] movs r0, 0x2 movs r3, 0x3 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 b @081AC2AE .pool @081AC298: @@ -797561,7 +797562,7 @@ bag_menu_draw_pocket_indicator_square: ; 81AC26C str r0, [sp, 0x4] movs r0, 0x2 movs r3, 0x3 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 @081AC2AE: movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram @@ -798340,14 +798341,14 @@ sub_81AC644: ; 81AC644 cmp r0, 0x2 bne @081ACA50 movs r0, 0x1 - bl ClearWindowTileMap + bl ClearWindowTilemap ldr r0, =0x0203ce7c ldrh r0, [r0] bl sub_81AE2FC movs r0, 0x3 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x4 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram b @081ACA86 @@ -800846,7 +800847,7 @@ setup_bag_menu_textboxes: ; 81AE054 movs r1, 0 bl FillWindowPixelBuffer adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -800982,7 +800983,7 @@ sub_81AE184: ; 81AE184 movs r1, 0 bl sub_8198070 ldrb r0, [r4] - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r4] bl RemoveWindow movs r0, 0x1 @@ -801040,7 +801041,7 @@ sub_81AE1F8: ; 81AE1F8 movs r1, 0 bl sub_8197DF8 ldrb r0, [r4] - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r4] bl RemoveWindow movs r0, 0x1 @@ -801417,7 +801418,7 @@ sub_81AE45C: ; 81AE45C cmp r6, 0 bne @081AE534 ldrb r0, [r5, 0x5] - bl ClearWindowTileMap + bl ClearWindowTilemap b @081AE546 .pool @081AE534: @@ -801474,7 +801475,7 @@ calls_per_item_funcs_in_list_outer: ; 81AE584 lsls r4, 24 lsrs r4, 24 ldrb r0, [r5, 0x10] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r5, 0x10] movs r1, 0x2 bl CopyWindowToVram @@ -801512,7 +801513,7 @@ sub_81AE5B0: ; 81AE5B0 str r4, [sp] ldrb r4, [r5, 0x4] str r4, [sp, 0x4] - bl PutWindowRectTileMapOverridePalette + bl PutWindowRectTilemapOverridePalette adds r5, 0x8 ldrb r0, [r5, 0x4] cmp r0, 0xFF @@ -803192,7 +803193,7 @@ sub_81AF264: ; 81AF264 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] @@ -803283,7 +803284,7 @@ sub_81AF2F0: ; 81AF2F0 mov r3, r12 strh r3, [r0, 0x2] movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r1, =0x02020630 @@ -803346,7 +803347,7 @@ sub_81AF380: ; 81AF380 orrs r0, r1 str r0, [sp, 0x8] add r0, sp, 0x4 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldrh r2, [r6, 0xC] cmp r2, r4 bne @081AF3DC @@ -803369,7 +803370,7 @@ sub_81AF380: ; 81AF380 ands r1, r5 orrs r1, r2 str r1, [r0, 0x4] - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette @081AF3EE: ldr r0, =sub_81AF504 movs r1, 0 @@ -803660,12 +803661,12 @@ sub_81AF620: ; 81AF620 ldr r4, =0x0000ffff cmp r0, r4 beq @081AF63E - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag @081AF63E: ldrh r0, [r5, 0x10] cmp r0, r4 beq @081AF648 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag @081AF648: ldrb r1, [r5, 0xC] lsls r0, r1, 4 @@ -803673,13 +803674,13 @@ sub_81AF620: ; 81AF620 lsls r0, 2 ldr r4, =0x02020630 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldrb r1, [r5, 0xD] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r6, 0 bl remove_task pop {r4-r6} @@ -803938,7 +803939,7 @@ sub_81AF828: ; 81AF828 ands r1, r3 orrs r1, r2 str r1, [r0, 0x4] - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldrh r2, [r6, 0x8] ldr r7, =0x0000ffff cmp r2, r7 @@ -803962,7 +803963,7 @@ sub_81AF828: ; 81AF828 ands r1, r5 orrs r1, r2 str r1, [r0, 0x4] - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette @081AF896: ldr r0, =nullsub_126 movs r1, 0 @@ -804011,7 +804012,7 @@ sub_81AF828: ; 81AF828 adds r2, 0x78 mov r0, sp movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront strb r0, [r5, 0xC] ldrb r1, [r5, 0xC] lsls r0, r1, 4 @@ -804020,7 +804021,7 @@ sub_81AF828: ; 81AF828 ldr r7, =0x02020630 adds r0, r7 adds r1, r5, 0 - bl obj_set_f18_to_r0_f42_to_40 + bl SetSpriteOamTables_NoPriorityFromTable ldrb r0, [r5, 0xC] lsls r1, r0, 4 adds r1, r0 @@ -804129,12 +804130,12 @@ sub_81AF9D8: ; 81AF9D8 ldr r6, =0x0000ffff cmp r0, r6 beq @081AF9FC - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag @081AF9FC: ldrh r0, [r4, 0x10] cmp r0, r6 beq @081AFA06 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag @081AFA06: ldrb r1, [r4, 0xC] lsls r0, r1, 4 @@ -804142,7 +804143,7 @@ sub_81AF9D8: ; 81AF9D8 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r5, 0 bl remove_task pop {r4-r6} @@ -804200,7 +804201,7 @@ sub_81AFA60: ; 81AFA60 ands r1, r4 orrs r1, r2 str r1, [r0, 0x4] - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldrh r2, [r5, 0x8] cmp r2, r4 bne @081AFAB4 @@ -804223,7 +804224,7 @@ sub_81AFA60: ; 81AFA60 ands r1, r6 orrs r1, r2 str r1, [r0, 0x4] - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette @081AFAC6: ldr r0, =nullsub_127 movs r1, 0 @@ -804255,7 +804256,7 @@ sub_81AFA60: ; 81AFA60 ldrb r2, [r5, 0x1] mov r0, sp movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront strb r0, [r4] ldr r3, =0x02020630 ldrb r1, [r4] @@ -804340,12 +804341,12 @@ sub_81AFBA0: ; 81AFBA0 ldr r6, =0x0000ffff cmp r0, r6 beq @081AFBBE - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag @081AFBBE: ldrh r0, [r4, 0x4] cmp r0, r6 beq @081AFBC8 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag @081AFBC8: ldrb r1, [r4] lsls r0, r1, 4 @@ -804353,7 +804354,7 @@ sub_81AFBA0: ; 81AFBA0 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r5, 0 bl remove_task pop {r4-r6} @@ -804739,7 +804740,7 @@ AddItemIconObject: ; 81AFE70 bl GetItemIconPic ldr r4, =0x0203cebc ldr r1, [r4] - bl call_LZZUnCompWram + bl LZDecompressWram ldr r0, [r4] ldr r4, =0x0203cec0 ldr r1, [r4] @@ -804758,7 +804759,7 @@ AddItemIconObject: ; 81AFE70 orrs r0, r2 str r0, [sp, 0x4] mov r0, sp - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic adds r0, r5, 0 movs r1, 0x1 bl GetItemIconPic @@ -804768,7 +804769,7 @@ AddItemIconObject: ; 81AFE70 ands r1, r4 orrs r1, r6 str r1, [r0, 0x4] - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette movs r0, 0x18 bl Alloc adds r5, r0, 0 @@ -804782,7 +804783,7 @@ AddItemIconObject: ; 81AFE70 movs r1, 0 movs r2, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -804823,7 +804824,7 @@ sub_81AFF34: ; 81AFF34 bl GetItemIconPic ldr r4, =0x0203cebc ldr r1, [r4] - bl call_LZZUnCompWram + bl LZDecompressWram ldr r0, [r4] ldr r4, =0x0203cec0 ldr r1, [r4] @@ -804842,7 +804843,7 @@ sub_81AFF34: ; 81AFF34 orrs r0, r2 str r0, [sp, 0x4] mov r0, sp - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic adds r0, r5, 0 movs r1, 0x1 bl GetItemIconPic @@ -804852,7 +804853,7 @@ sub_81AFF34: ; 81AFF34 ands r1, r4 orrs r1, r6 str r1, [r0, 0x4] - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette movs r0, 0x18 bl Alloc adds r5, r0, 0 @@ -804866,7 +804867,7 @@ sub_81AFF34: ; 81AFF34 movs r1, 0 movs r2, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -805108,8 +805109,8 @@ sub_81B0038: ; 81B0038 sub_81B01B0: ; 81B01B0 push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl do_scheduled_bg_tilemap_copies_to_vram bl fade_and_return_progress_probably pop {r0} @@ -805119,8 +805120,8 @@ sub_81B01B0: ; 81B01B0 thumb_func_start sub_81B01CC sub_81B01CC: ; 81B01CC push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -805222,10 +805223,10 @@ sub_81B020C: ; 81B020C b @081B048C .pool @081B02D4: - bl reset_all_obj_data + bl ResetAllObjectData b @081B0484 @081B02DA: - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -805527,7 +805528,7 @@ sub_81B0550: ; 81B0550 bl InitBgsFromTemplates ldr r1, [r5] movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap bl sub_8121E10 movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram @@ -805607,7 +805608,7 @@ sub_81B05C8: ; 81B05C8 ldr r0, =gUnknown_08D96BA0 ldr r1, =0x0203cee4 ldr r1, [r1] - bl call_LZZUnCompWram + bl LZDecompressWram b @081B069A .pool @081B0658: @@ -805851,7 +805852,7 @@ sub_81B07E0: ; 81B07E0 ldr r0, [r4] adds r0, r5, r0 ldrb r0, [r0, 0x8] - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram b @081B093E @@ -805957,7 +805958,7 @@ sub_81B07E0: ; 81B07E0 ldr r0, [r0] adds r0, r5, r0 ldrb r0, [r0, 0x8] - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram @081B093E: @@ -806711,7 +806712,7 @@ sub_81B0F28: ; 81B0F28 movs r1, 0xE movs r2, 0x17 movs r3, 0x11 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect b @081B0FBC .pool @081B0F54: @@ -807070,7 +807071,7 @@ sub_81B120C: ; 81B120C movs r0, 0x1 movs r2, 0x17 movs r3, 0x10 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette ldr r1, =gUnknown_086157E0 str r6, [sp] str r5, [sp, 0x4] @@ -807078,7 +807079,7 @@ sub_81B120C: ; 81B120C movs r0, 0x1 movs r2, 0x17 movs r3, 0x12 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram add sp, 0xC @@ -807200,7 +807201,7 @@ c3_0811FAB4: ; 81B12F8 ldr r0, [r4] bl SetMainCallback2 @081B133E: - bl reset_all_obj_data + bl ResetAllObjectData bl sub_81B06F4 adds r0, r5, 0 bl remove_task @@ -808277,7 +808278,7 @@ sub_81B1B8C: ; 81B1B8C movs r1, 0 bl sub_8198070 movs r0, 0x6 - bl ClearWindowTileMap + bl ClearWindowTilemap @081B1BC2: adds r0, r5, 0 bl remove_task @@ -808341,7 +808342,7 @@ sub_81B1C1C: ; 81B1C1C movs r1, 0 bl sub_8198070 movs r0, 0x6 - bl ClearWindowTileMap + bl ClearWindowTilemap bl sub_81221AC lsls r0, 24 lsrs r0, 24 @@ -809367,7 +809368,7 @@ sub_81B2428: ; 81B2428 movs r3, 0x1 bl sub_8199EEC adds r0, r4, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0 movs r1, 0x2 bl CopyWindowToVram @@ -809439,7 +809440,7 @@ sub_81B2428: ; 81B2428 bl box_print @081B2540: adds r0, r5, 0 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r5, 0 movs r1, 0x2 bl CopyWindowToVram @@ -811153,7 +811154,7 @@ sub_81B3394: ; 81B3394 ldr r4, =0x0203cec4 ldr r0, [r4] ldrb r0, [r0, 0xC] - bl ClearWindowTileMap + bl ClearWindowTilemap ldr r0, [r4] adds r0, 0xC bl sub_81B302C @@ -811951,10 +811952,10 @@ sub_81B3938: ; 81B3938 bl sub_8199CBC add r0, sp, 0x8 ldrb r0, [r0] - bl ClearWindowTileMap + bl ClearWindowTilemap add r0, sp, 0x8 ldrb r0, [r0, 0x1] - bl ClearWindowTileMap + bl ClearWindowTilemap ldr r4, =0x0203cec8 movs r0, 0x9 strb r0, [r4, 0xB] @@ -812096,7 +812097,7 @@ sub_81B3B40: ; 81B3B40 movs r0, 0 movs r1, 0 mov r3, r9 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 ldr r1, [sp, 0x30] lsls r0, r1, 16 asrs r0, 16 @@ -812132,7 +812133,7 @@ sub_81B3B40: ; 81B3B40 str r0, [sp, 0x20] ldr r1, [sp, 0x28] movs r3, 0 - bl CopyRectToBgTileMapBufferRect + bl CopyRectToBgTilemapBufferRect @081B3BFA: add sp, 0x34 pop {r3-r5} @@ -812365,14 +812366,14 @@ sub_81B3D48: ; 81B3D48 lsls r0, 4 adds r0, r1 ldrb r0, [r0, 0x8] - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0xA ldrsb r0, [r4, r0] ldr r1, [r5] lsls r0, 4 adds r0, r1 ldrb r0, [r0, 0x8] - bl PutWindowTileMap + bl PutWindowTilemap ldr r0, =0x0203cef0 ldr r1, [r0] ldrb r2, [r6] @@ -812399,14 +812400,14 @@ sub_81B3D48: ; 81B3D48 lsls r0, 4 adds r0, r1 ldrb r0, [r0, 0x8] - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0xA ldrsb r0, [r4, r0] ldr r1, [r5] lsls r0, 4 adds r0, r1 ldrb r0, [r0, 0x8] - bl ClearWindowTileMap + bl ClearWindowTilemap mov r0, r8 subs r0, 0x8 adds r0, r7, r0 @@ -812452,14 +812453,14 @@ sub_81B3E60: ; 81B3E60 lsls r0, 4 adds r0, r1 ldrb r0, [r0, 0x8] - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0xA ldrsb r0, [r5, r0] ldr r1, [r4] lsls r0, 4 adds r0, r1 ldrb r0, [r0, 0x8] - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram ldr r0, =0x0203cef0 @@ -815745,7 +815746,7 @@ sub_81B5C14: ; 81B5C14 ldrb r1, [r2, 0x2] ldrb r2, [r2, 0x3] movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront strb r0, [r4, 0xA] adds r0, r5, 0 adds r1, r4, 0 @@ -815771,7 +815772,7 @@ sub_81B5C48: ; 81B5C48 ldrb r1, [r2, 0x2] ldrb r2, [r2, 0x3] movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront strb r0, [r4, 0xA] ldr r2, =0x02020630 ldrb r0, [r4, 0xA] @@ -815841,7 +815842,7 @@ sub_81B5CB0: ; 81B5CB0 ldr r1, =0x02020630 adds r0, r1 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim b @081B5D0E .pool @081B5CFC: @@ -815852,7 +815853,7 @@ sub_81B5CB0: ; 81B5CB0 ldr r1, =0x02020630 adds r0, r1 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @081B5D0E: ldr r2, =0x02020630 ldrb r1, [r4, 0xA] @@ -815877,9 +815878,9 @@ sub_81B5CB0: ; 81B5CB0 sub_81B5D30: ; 81B5D30 push {lr} ldr r0, =gUnknown_08615EB0 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r0, =gUnknown_08615EB8 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette pop {r0} bx r0 .pool @@ -815997,7 +815998,7 @@ sub_81B5DF0: ; 81B5DF0 lsrs r3, 24 movs r1, 0xFA movs r2, 0xAA - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r4, r0, 4 @@ -816017,7 +816018,7 @@ sub_81B5DF0: ; 81B5DF0 strh r6, [r5, 0x3C] adds r0, r5, 0 mov r1, r9 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r1, [r4] adds r0, r5, 0 bl _call_via_r1 @@ -816091,7 +816092,7 @@ sub_81B5ECC: ; 81B5ECC ldrb r1, [r2, 0x6] ldrb r2, [r2, 0x7] movs r3, 0x8 - bl obj_add_from_template_forward_search + bl AddObjectToFront strb r0, [r4, 0xB] @081B5EEA: pop {r4} @@ -816112,7 +816113,7 @@ sub_81B5EF4: ; 81B5EF4 ldrb r1, [r2, 0x6] ldrb r2, [r2, 0x7] movs r3, 0x8 - bl obj_add_from_template_forward_search + bl AddObjectToFront strb r0, [r4, 0xB] ldr r2, =0x02020630 ldrb r0, [r4, 0xB] @@ -816144,7 +816145,7 @@ sub_81B5F34: ; 81B5F34 ldr r0, =gUnknown_08615F08 adds r1, r3, 0 movs r3, 0x8 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r2, =0x02020630 @@ -816176,7 +816177,7 @@ sub_81B5F74: ; 81B5F74 ldr r0, =gUnknown_08615F78 adds r1, r3, 0 movs r3, 0x8 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 pop {r1} @@ -816197,7 +816198,7 @@ sub_81B5F98: ; 81B5F98 lsls r0, 2 ldr r2, =0x02020630 adds r0, r2 - bl obj_anim_image_start + bl StartObjectImageAnim pop {r0} bx r0 .pool @@ -816224,14 +816225,14 @@ sub_81B5FBC: ; 81B5FBC add r4, r8 adds r0, r4, 0 movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim lsls r5, r7, 4 adds r5, r7 lsls r5, 2 add r5, r8 adds r0, r5, 0 movs r1, 0x4 - bl obj_anim_image_start + bl StartObjectImageAnim strh r6, [r4, 0x26] strh r6, [r5, 0x26] b @081B602C @@ -816245,14 +816246,14 @@ sub_81B5FBC: ; 81B5FBC add r5, r8 adds r0, r5, 0 movs r1, 0x3 - bl obj_anim_image_start + bl StartObjectImageAnim lsls r4, r7, 4 adds r4, r7 lsls r4, 2 add r4, r8 adds r0, r4, 0 movs r1, 0x5 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =0x0000fffc strh r0, [r5, 0x26] movs r0, 0x4 @@ -816270,11 +816271,11 @@ sub_81B5FBC: ; 81B5FBC sub_81B6040: ; 81B6040 push {lr} ldr r0, =gUnknown_08615EF8 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_08615F70 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_08615F00 - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette pop {r0} bx r0 .pool @@ -816294,7 +816295,7 @@ sub_81B6064: ; 81B6064 ldrb r1, [r2, 0x4] ldrb r2, [r2, 0x5] movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront strb r0, [r4, 0xC] adds r0, r5, 0 adds r1, r4, 0 @@ -816320,7 +816321,7 @@ sub_81B6098: ; 81B6098 ldrb r1, [r2, 0x4] ldrb r2, [r2, 0x5] movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront strb r0, [r4, 0xC] adds r0, r5, 0 adds r1, r4, 0 @@ -816390,7 +816391,7 @@ sub_81B60FC: ; 81B60FC subs r1, r2, 0x1 lsls r1, 24 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r1, [r5, 0xC] lsls r0, r1, 4 adds r0, r1 @@ -816413,9 +816414,9 @@ sub_81B60FC: ; 81B60FC sub_81B6160: ; 81B6160 push {lr} ldr r0, =gUnknown_08615FF8 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_08616000 - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette pop {r0} bx r0 .pool @@ -824671,7 +824672,7 @@ sub_81BAE98: ; 81BAE98 adds r0, r1 lsls r0, 2 adds r0, r6 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles bl dp01_tbl3_exec_completed @081BAEE8: pop {r4-r6} @@ -824919,7 +824920,7 @@ sub_81BB02C: ; 81BB02C adds r0, r1 lsls r0, 2 add r0, r10 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r4, =0x03005d70 ldrb r0, [r7] mov r1, r8 @@ -824957,7 +824958,7 @@ sub_81BB02C: ; 81BB02C lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r5, =0x03005d70 ldrb r1, [r4] adds r0, r1, r5 @@ -825708,7 +825709,7 @@ sub_81BB78C: ; 81BB78C adds r0, r1 lsls r0, 2 adds r0, r6 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, =0x03005d70 ldrb r0, [r4] adds r0, r1 @@ -825755,7 +825756,7 @@ sub_81BB828: ; 81BB828 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 @@ -825966,9 +825967,9 @@ sub_81BB9F4: ; 81BB9F4 strb r0, [r1, 0x1] ldr r4, =0x000027f9 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag ldr r0, =c3_0802FDF4 movs r1, 0xA bl AddTask @@ -825993,7 +825994,7 @@ sub_81BB9F4: ; 81BB9F4 ldr r1, =0x02020630 adds r0, r1 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r4, =0x03005d70 ldrb r1, [r7] adds r0, r1, r4 @@ -826080,7 +826081,7 @@ sub_81BBAE8: ; 81BBAE8 cmp r0, 0 bne @081BBB60 adds r0, r3, r5 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 @@ -828320,7 +828321,7 @@ sub_81BCF58: ; 81BCF58 mov r0, r8 adds r1, r5, 0 adds r2, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r4, =0x020241e4 ldrb r1, [r6] adds r1, r4 @@ -828366,7 +828367,7 @@ sub_81BCF58: ; 81BCF58 ldr r1, =0x020244e4 adds r2, r1 ldrb r1, [r2] - bl obj_anim_image_start + bl StartObjectImageAnim ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 @@ -828496,7 +828497,7 @@ sub_81BD0E4: ; 81BD0E4 mov r0, r10 adds r1, r5, 0 adds r2, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r4, =0x020241e4 adds r4, r6, r4 strb r0, [r4] @@ -828548,7 +828549,7 @@ sub_81BD0E4: ; 81BD0E4 ldr r1, =0x020244e4 adds r6, r1 ldrb r1, [r6] - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -828635,7 +828636,7 @@ sub_81BD260: ; 81BD260 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 @@ -828784,7 +828785,7 @@ sub_81BD37C: ; 81BD37C adds r0, r6, 0 mov r1, r8 adds r2, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r6, =0x020241e4 ldrb r1, [r5] adds r1, r6 @@ -828858,7 +828859,7 @@ sub_81BD37C: ; 81BD37C mov r0, r8 mov r1, r9 adds r2, r4, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r4, =0x020241e4 ldrb r1, [r6] adds r1, r4 @@ -828867,7 +828868,7 @@ sub_81BD37C: ; 81BD37C lsls r5, 3 adds r5, r0 ldrh r0, [r5, 0x4] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag ldr r5, =0x02020630 ldrb r1, [r6] adds r1, r4 @@ -830369,9 +830370,9 @@ sub_81BE10C: ; 81BE10C lsls r0, 2 adds r0, r4 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =0x0000d6f9 - bl gpu_pal_alloc_new + bl AllocObjectPalette lsls r0, 24 lsrs r4, r0, 24 ldr r2, =0x02038bce @@ -831288,7 +831289,7 @@ sub_81BE968: ; 81BE968 sub_81BE994: ; 81BE994 push {lr} ldr r0, =gUnknown_08617D94 - bl gpu_tile_obj_alloc_and_load_multiple + bl LoadObjectPics bl sub_81BEA20 ldr r0, =sub_81BE9C0 movs r1, 0x8 @@ -831345,7 +831346,7 @@ sub_81BEA00: ; 81BEA00 lsrs r4, 24 movs r0, 0xFA lsls r0, 4 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 bl remove_task bl script_env_2_enable_and_set_ctx_running @@ -831375,7 +831376,7 @@ sub_81BEA20: ; 81BEA20 ldrsh r2, [r0, r3] ldr r0, =gUnknown_08617E60 movs r3, 0x8 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 lsls r0, r1, 4 @@ -831416,7 +831417,7 @@ sub_81BEA20: ; 81BEA20 asrs r2, 16 ldr r0, =gUnknown_08617E34 movs r3, 0x8 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 lsls r0, r1, 4 @@ -831474,7 +831475,7 @@ sub_81BEAD8: ; 81BEAD8 cmp r3, r0 ble @081BEB1A adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles bl sub_81BE968 @081BEB1A: pop {r4} @@ -831672,7 +831673,7 @@ sub_81BEBF4: ; 81BEBF4 ldr r0, =0x0203cf08 ldr r1, [r0] movs r0, 0 - bl SetBgTileMap + bl SetBgTilemap ldr r1, =gUnknown_08617B94 movs r0, 0x6 str r0, [sp] @@ -831683,9 +831684,9 @@ sub_81BEBF4: ; 81BEBF4 movs r0, 0 movs r2, 0xC movs r3, 0x1D - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @081BECD8: ldr r1, =0x03005e00 lsls r0, r5, 2 @@ -831991,7 +831992,7 @@ sub_81BED50: ; 81BED50 .pool @081BEF64: movs r0, 0 - bl UnsetBgTileMap + bl UnsetBgTilemap ldr r0, =sub_81BEBB4 bl get_task_id_by_function lsls r0, 24 @@ -832174,7 +832175,7 @@ sub_81BF028: ; 81BF028 mov r0, sp movs r1, 0x80 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r4] movs r3, 0 strb r0, [r1, 0x8] @@ -832273,7 +832274,7 @@ sub_81BF028: ; 81BF028 cmp r1, r0 bne @081BF238 adds r0, r2, r3 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r5] ldr r0, [r0, 0xC] bl Free @@ -832357,7 +832358,7 @@ sub_81BF248: ; 81BF248 bls @081BF274 adds r0, r5, 0 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim b @081BF2B0 .pool @081BF2AC: @@ -832483,7 +832484,7 @@ sub_81BF384: ; 81BF384 bl SoundVSyncOff_rev01 movs r0, 0 bl SetVBlankCallback - bl reset_all_obj_data + bl ResetAllObjectData bl clear_tasks bl remove_some_task movs r0, 0 @@ -832962,7 +832963,7 @@ sub_81BF7E8: ; 81BF7E8 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0x1 movs r1, 0xAA bl FillWindowPixelBuffer @@ -832982,7 +832983,7 @@ sub_81BF7E8: ; 81BF7E8 movs r3, 0 bl box_print movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x1 movs r1, 0x2 bl CopyWindowToVram @@ -833003,18 +833004,18 @@ sub_81BF7E8: ; 81BF7E8 .4byte @081BF878 @081BF868: movs r0, 0x2 - bl PutWindowTileMap + bl PutWindowTilemap b @081BF87E @081BF870: movs r0, 0x3 - bl PutWindowTileMap + bl PutWindowTilemap b @081BF87E @081BF878: movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap @081BF87E: movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r5, =gUnknown_08618178 lsls r4, r6, 1 adds r4, r6 @@ -833263,8 +833264,8 @@ sub_81BFA80: ; 81BFA80 sub_81BFAB4: ; 81BFAB4 push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl do_scheduled_bg_tilemap_copies_to_vram bl fade_and_return_progress_probably pop {r0} @@ -833274,8 +833275,8 @@ sub_81BFAB4: ; 81BFAB4 thumb_func_start sub_81BFAD0 sub_81BFAD0: ; 81BFAD0 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -833373,7 +833374,7 @@ sub_81BFB10: ; 81BFB10 b @081BFDE4 .pool @081BFBD0: - bl reset_all_obj_data + bl ResetAllObjectData ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -833381,7 +833382,7 @@ sub_81BFB10: ; 81BFB10 b @081BFDEE .pool @081BFBE4: - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator b @081BFDE6 @081BFBEA: bl sub_81BFE24 @@ -833634,16 +833635,16 @@ sub_81BFE24: ; 81BFE24 ldr r0, =0x000020bc adds r1, r0 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x000010bc adds r1, r0 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] adds r1, 0xBC movs r0, 0x3 - bl SetBgTileMap + bl SetBgTilemap bl sub_8121E10 movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram @@ -833731,7 +833732,7 @@ sub_81BFEB0: ; 81BFEB0 ldr r4, =0x0203cf1c ldr r1, [r4] adds r1, 0xBC - bl call_LZZUnCompWram + bl LZDecompressWram ldr r1, [r4] ldr r2, =0x000040f0 adds r1, r2 @@ -833742,7 +833743,7 @@ sub_81BFEB0: ; 81BFEB0 ldr r1, [r4] ldr r2, =0x000008bc adds r1, r2 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r1, [r4] b @081C004A .pool @@ -833751,7 +833752,7 @@ sub_81BFEB0: ; 81BFEB0 ldr r1, [r4] ldr r2, =0x000018bc adds r1, r2 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r1, [r4] b @081C004A .pool @@ -833760,7 +833761,7 @@ sub_81BFEB0: ; 81BFEB0 ldr r1, [r4] ldr r2, =0x000028bc adds r1, r2 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r1, [r4] b @081C004A .pool @@ -833769,7 +833770,7 @@ sub_81BFEB0: ; 81BFEB0 ldr r1, [r4] ldr r2, =0x000038bc adds r1, r2 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r1, [r4] b @081C004A .pool @@ -833791,12 +833792,12 @@ sub_81BFEB0: ; 81BFEB0 .pool @081BFFF0: ldr r0, =gUnknown_0861CFBC - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic b @081C0046 .pool @081BFFFC: ldr r0, =gUnknown_0861D074 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =0x0203cf1c ldr r1, [r0] ldr r2, =0x000040f0 @@ -833805,12 +833806,12 @@ sub_81BFEB0: ; 81BFEB0 .pool @081C0018: ldr r0, =gUnknown_0861D0F8 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic b @081C0046 .pool @081C0024: ldr r0, =gUnknown_0861D100 - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette ldr r0, =0x0203cf1c ldr r1, [r0] ldr r2, =0x000040f0 @@ -833819,7 +833820,7 @@ sub_81BFEB0: ; 81BFEB0 .pool @081C0040: ldr r0, =gUnknown_0861D07C - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette @081C0046: ldr r0, =0x0203cf1c ldr r1, [r0] @@ -834211,20 +834212,20 @@ sub_81C0348: ; 81C0348 ldr r1, [r6] adds r1, r4 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r6] adds r1, r5 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap movs r1, 0x80 lsls r1, 9 movs r0, 0x2 movs r2, 0x1 bl ChangeBgX movs r0, 0x13 - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0xD - bl ClearWindowTileMap + bl ClearWindowTilemap @081C03D8: ldr r0, =0x0203cf1c ldr r1, [r0] @@ -834248,7 +834249,7 @@ sub_81C0348: ; 81C0348 cmp r0, 0x1 bls @081C0416 movs r0, 0xD - bl PutWindowTileMap + bl PutWindowTilemap @081C0416: bl sub_81C2524 ldr r0, =0x0203cf1c @@ -834328,8 +834329,8 @@ sub_81C0484: ; 81C0484 ldrb r0, [r0] strb r0, [r1] bl sub_81C4898 - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator bl sub_80A369C ldr r0, =0x03007420 ldr r1, =0x0000ffff @@ -834556,7 +834557,7 @@ sub_81C0604: ; 81C0604 movs r1, 0x1 bl sub_81C4204 movs r0, 0xD - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram movs r0, 0 @@ -834642,7 +834643,7 @@ sub_81C0704: ; 81C0704 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_resources + bl RemoveObjectAndFreeResources b @081C08EC .pool @081C07A8: @@ -835168,7 +835169,7 @@ sub_81C0B8C: ; 81C0B8C lsls r2, 12 adds r2, 0xBC adds r1, r2 - bl SetBgTileMap + bl SetBgTilemap movs r0, 0x1 bl ShowBg movs r0, 0x2 @@ -835352,7 +835353,7 @@ sub_81C0D44: ; 81C0D44 ldr r3, =0xfffff0bc adds r1, r3 adds r1, r2, r1 - bl SetBgTileMap + bl SetBgTilemap ldrb r0, [r4, 0x2] movs r1, 0x80 lsls r1, 9 @@ -835429,7 +835430,7 @@ sub_81C0E48: ; 81C0E48 ldrh r6, [r1] mov r8, r6 movs r0, 0x13 - bl ClearWindowTileMap + bl ClearWindowTilemap ldr r2, =0x02020630 ldr r0, [r5] ldr r1, =0x000040d5 @@ -835445,7 +835446,7 @@ sub_81C0E48: ; 81C0E48 cmp r0, 0 blt @081C0E96 movs r0, 0xD - bl ClearWindowTileMap + bl ClearWindowTilemap @081C0E96: movs r4, 0x3 negs r4, r4 @@ -835463,9 +835464,9 @@ sub_81C0E48: ; 81C0E48 cmp r0, 0 bne @081C0EC4 movs r0, 0x5 - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0x6 - bl PutWindowTileMap + bl PutWindowTilemap @081C0EC4: ldr r0, [r5] ldr r1, =0x000020bc @@ -835732,7 +835733,7 @@ sub_81C1070: ; 81C1070 bne @081C115E @081C1118: movs r0, 0x13 - bl ClearWindowTileMap + bl ClearWindowTilemap ldr r2, =0x02020630 ldr r0, =0x0203cf1c ldr r0, [r0] @@ -835749,7 +835750,7 @@ sub_81C1070: ; 81C1070 cmp r0, 0 blt @081C1142 movs r0, 0xD - bl ClearWindowTileMap + bl ClearWindowTilemap @081C1142: movs r0, 0 bl schedule_bg_copy_tilemap_to_vram @@ -835779,9 +835780,9 @@ sub_81C1070: ; 81C1070 cmp r0, 0 bne @081C11A0 movs r0, 0xE - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0xF - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram movs r0, 0 @@ -835832,9 +835833,9 @@ sub_81C11F4: ; 81C11F4 movs r0, 0x8 bl sub_81C4C60 movs r0, 0x6 - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0x5 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 bl sub_81C3E9C ldr r4, =0x0203cf1c @@ -835858,9 +835859,9 @@ sub_81C11F4: ; 81C11F4 cmp r0, 0x4 beq @081C125E movs r0, 0xE - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0xF - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0 movs r1, 0x3 bl sub_81C1DA4 @@ -836629,9 +836630,9 @@ sub_81C18F4: ; 81C18F4 lsls r4, 24 lsrs r4, 24 movs r0, 0xE - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0xF - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram movs r0, 0 @@ -836743,7 +836744,7 @@ sub_81C1940: ; 81C1940 b @081C1B74 @081C1A00: movs r0, 0x13 - bl ClearWindowTileMap + bl ClearWindowTilemap ldr r2, =0x02020630 ldr r0, [r4] ldr r1, =0x000040d5 @@ -836759,7 +836760,7 @@ sub_81C1940: ; 81C1940 cmp r0, 0 blt @081C1A28 movs r0, 0xD - bl ClearWindowTileMap + bl ClearWindowTilemap @081C1A28: ldr r1, [r4] ldr r2, =0x000040c6 @@ -836799,7 +836800,7 @@ sub_81C1940: ; 81C1940 cmp r0, 0x3 beq @081C1B74 movs r0, 0x13 - bl ClearWindowTileMap + bl ClearWindowTilemap ldr r2, =0x02020630 ldr r0, [r4] ldr r1, =0x000040d5 @@ -836815,7 +836816,7 @@ sub_81C1940: ; 81C1940 cmp r0, 0 blt @081C1AB0 movs r0, 0xD - bl ClearWindowTileMap + bl ClearWindowTilemap @081C1AB0: ldr r1, [r4] ldr r2, =0x000040c6 @@ -836852,7 +836853,7 @@ sub_81C1940: ; 81C1940 cmp r0, 0 beq @081C1B74 movs r0, 0x13 - bl ClearWindowTileMap + bl ClearWindowTilemap ldr r2, =0x02020630 ldr r4, =0x0203cf1c ldr r0, [r4] @@ -836869,7 +836870,7 @@ sub_81C1940: ; 81C1940 cmp r0, 0 blt @081C1B38 movs r0, 0xD - bl ClearWindowTileMap + bl ClearWindowTilemap @081C1B38: ldr r1, [r4] ldr r2, =0x000040c6 @@ -837044,7 +837045,7 @@ sub_81C1BA0: ; 81C1BA0 adds r1, r4, 0 movs r2, 0xB movs r3, 0 - bl CopyToBgTileMapBufferRect_ChangePalette + bl CopyToBgTilemapBufferRect_ChangePalette movs r0, 0x3 bl schedule_bg_copy_tilemap_to_vram adds r0, r4, 0 @@ -837296,7 +837297,7 @@ sub_81C1E20: ; 81C1E20 cmp r0, 0x2 bne @081C1ED4 movs r0, 0xE - bl PutWindowTileMap + bl PutWindowTilemap b @081C1ED4 .pool @081C1EAC: @@ -837315,10 +837316,10 @@ sub_81C1E20: ; 81C1E20 cmp r0, 0 blt @081C1ECE movs r0, 0xD - bl PutWindowTileMap + bl PutWindowTilemap @081C1ECE: movs r0, 0x13 - bl PutWindowTileMap + bl PutWindowTilemap @081C1ED4: movs r0, 0 bl schedule_bg_copy_tilemap_to_vram @@ -837462,7 +837463,7 @@ sub_81C1F80: ; 81C1F80 cmp r0, 0 bne @081C2006 movs r0, 0xF - bl PutWindowTileMap + bl PutWindowTilemap @081C2006: ldrh r0, [r4, 0x4] bl sub_81C240C @@ -837484,10 +837485,10 @@ sub_81C1F80: ; 81C1F80 cmp r0, 0 blt @081C2046 movs r0, 0xD - bl PutWindowTileMap + bl PutWindowTilemap @081C2046: movs r0, 0x13 - bl PutWindowTileMap + bl PutWindowTilemap @081C204C: movs r0, 0 bl schedule_bg_copy_tilemap_to_vram @@ -837623,7 +837624,7 @@ sub_81C20F0: ; 81C20F0 bge @081C217A bl sub_81C4A88 movs r0, 0xD - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram @081C217A: @@ -837920,7 +837921,7 @@ sub_81C22CC: ; 81C22CC cmp r0, 0x7 bls @081C2356 movs r0, 0x1 - bl GetBgTileMap + bl GetBgTilemap ldr r1, =0x0203cf1c ldr r1, [r1] ldr r2, =0x000010bc @@ -838272,11 +838273,11 @@ sub_81C2628: ; 81C2628 bl sub_81C228C @081C26C6: movs r0, 0x11 - bl PutWindowTileMap + bl PutWindowTilemap b @081C26EE @081C26CE: movs r0, 0x11 - bl ClearWindowTileMap + bl ClearWindowTilemap mov r0, r8 bl sub_806EBA4 lsls r0, 24 @@ -838343,9 +838344,9 @@ sub_81C2628: ; 81C2628 mov r0, r8 bl sub_81C27DC movs r0, 0x12 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x13 - bl PutWindowTileMap + bl PutWindowTilemap add sp, 0x18 pop {r3} mov r8, r3 @@ -838375,11 +838376,11 @@ sub_81C2794: ; 81C2794 movs r3, 0x1 bl sub_81C25A4 movs r0, 0x12 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x11 - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0x13 - bl ClearWindowTileMap + bl ClearWindowTilemap add sp, 0x8 pop {r4} pop {r0} @@ -838725,13 +838726,13 @@ sub_81C2AFC: ; 81C2AFC lsrs r4, r0, 24 adds r5, r4, 0 movs r0, 0 - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0x1 - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0x2 - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0x3 - bl ClearWindowTileMap + bl ClearWindowTilemap cmp r4, 0x1 beq @081C2B66 cmp r4, 0x1 @@ -838747,9 +838748,9 @@ sub_81C2AFC: ; 81C2AFC b @081C2C06 @081C2B34: movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x4 - bl PutWindowTileMap + bl PutWindowTilemap bl sub_81A6BF4 lsls r0, 24 lsrs r0, 24 @@ -838762,24 +838763,24 @@ sub_81C2AFC: ; 81C2AFC bne @081C2B5E @081C2B58: movs r0, 0x8 - bl PutWindowTileMap + bl PutWindowTilemap @081C2B5E: movs r0, 0x9 - bl PutWindowTileMap + bl PutWindowTilemap b @081C2C06 @081C2B66: movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0xA - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0xB - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0xC - bl PutWindowTileMap + bl PutWindowTilemap b @081C2C06 @081C2B80: movs r0, 0x2 - bl PutWindowTileMap + bl PutWindowTilemap ldr r0, =0x0203cf1c ldr r1, [r0] ldr r2, =0x000040bc @@ -838797,16 +838798,16 @@ sub_81C2AFC: ; 81C2AFC cmp r0, r1 beq @081C2C06 movs r0, 0xE - bl PutWindowTileMap + bl PutWindowTilemap b @081C2C06 .pool @081C2BBC: movs r0, 0x5 - bl PutWindowTileMap + bl PutWindowTilemap b @081C2C06 @081C2BC4: movs r0, 0x3 - bl PutWindowTileMap + bl PutWindowTilemap ldr r0, =0x0203cf1c ldr r1, [r0] ldr r2, =0x000040bc @@ -838824,12 +838825,12 @@ sub_81C2AFC: ; 81C2AFC cmp r0, r1 beq @081C2C06 movs r0, 0xF - bl PutWindowTileMap + bl PutWindowTilemap b @081C2C06 .pool @081C2C00: movs r0, 0x5 - bl PutWindowTileMap + bl PutWindowTilemap @081C2C06: movs r4, 0 ldr r5, =0x0203cf1c @@ -838839,7 +838840,7 @@ sub_81C2AFC: ; 81C2AFC adds r0, r1 adds r0, r4 ldrb r0, [r0] - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -838874,7 +838875,7 @@ sub_81C2C38: ; 81C2C38 b @081C2D0E @081C2C58: movs r0, 0x4 - bl ClearWindowTileMap + bl ClearWindowTilemap bl sub_81A6BF4 lsls r0, 24 lsrs r0, 24 @@ -838887,18 +838888,18 @@ sub_81C2C38: ; 81C2C38 bne @081C2C7C @081C2C76: movs r0, 0x8 - bl ClearWindowTileMap + bl ClearWindowTilemap @081C2C7C: movs r0, 0x9 - bl ClearWindowTileMap + bl ClearWindowTilemap b @081C2D0E @081C2C84: movs r0, 0xA - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0xB - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0xC - bl ClearWindowTileMap + bl ClearWindowTilemap b @081C2D0E @081C2C98: ldr r0, =0x0203cf1c @@ -838918,12 +838919,12 @@ sub_81C2C38: ; 81C2C38 cmp r0, r1 beq @081C2D0E movs r0, 0xE - bl ClearWindowTileMap + bl ClearWindowTilemap b @081C2D0E .pool @081C2CCC: movs r0, 0x5 - bl ClearWindowTileMap + bl ClearWindowTilemap b @081C2D0E @081C2CD4: ldr r0, =0x0203cf1c @@ -838943,12 +838944,12 @@ sub_81C2C38: ; 81C2C38 cmp r0, r1 beq @081C2D0E movs r0, 0xF - bl ClearWindowTileMap + bl ClearWindowTilemap b @081C2D0E .pool @081C2D08: movs r0, 0x5 - bl ClearWindowTileMap + bl ClearWindowTilemap @081C2D0E: movs r4, 0 @081C2D10: @@ -839008,7 +839009,7 @@ sub_81C2D68: ; 81C2D68 ldrb r0, [r4] cmp r0, 0xFF beq @081C2D8C - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r4] bl RemoveWindow movs r0, 0xFF @@ -840991,12 +840992,12 @@ sub_81C3E9C: ; 81C3E9C bl sub_81C25A4 @081C3F20: adds r0, r5, 0 - bl PutWindowTileMap + bl PutWindowTilemap b @081C3F36 .pool @081C3F30: adds r0, r5, 0 - bl ClearWindowTileMap + bl ClearWindowTilemap @081C3F36: movs r0, 0 bl schedule_bg_copy_tilemap_to_vram @@ -841312,7 +841313,7 @@ sub_81C41C0: ; 81C41C0 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r5] ldr r1, =0x000040d3 adds r0, r1 @@ -841440,7 +841441,7 @@ sub_81C42C8: ; 81C42C8 movs r1, 0 movs r2, 0 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r1, [r5] ldr r2, =0x000040d3 adds r1, r2 @@ -841494,7 +841495,7 @@ sub_81C4318: ; 81C4318 adds r0, r4, 0 adds r1, r5, 0 str r3, [sp] - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =gUnknown_0861CFDC adds r5, r0 ldrb r1, [r5] @@ -841902,7 +841903,7 @@ sub_81C45F4: ; 81C45F4 @081C46B0: ldr r1, [r1, 0x8] ldr r3, [r5, 0xC] - bl help_system_enable_unless_flashback__sp199 + bl DecompressMonPic_DetectFrontOrBack_2 b @081C4768 .pool @081C46CC: @@ -841913,7 +841914,7 @@ sub_81C45F4: ; 81C45F4 ldr r1, [r3, 0x8] @081C46D6: ldr r3, [r5, 0xC] - bl sub_8034B50 + bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack b @081C4768 .pool @081C46E4: @@ -841943,7 +841944,7 @@ sub_81C45F4: ; 81C45F4 ldrh r2, [r5, 0x2] ldr r3, [r5, 0xC] adds r0, r4, 0 - bl help_system_enable_unless_flashback__sp199 + bl DecompressMonPic_DetectFrontOrBack_2 b @081C4768 .pool @081C472C: @@ -841958,7 +841959,7 @@ sub_81C45F4: ; 81C45F4 ldrh r2, [r5, 0x2] ldr r3, [r5, 0xC] adds r0, r4, 0 - bl sub_8034B50 + bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack b @081C4768 .pool @081C4750: @@ -841967,7 +841968,7 @@ sub_81C45F4: ; 81C45F4 ldr r2, [r5, 0xC] bl sub_806E7CC adds r4, r0, 0 - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette ldrh r0, [r4, 0x4] movs r1, 0x1 bl sub_806A068 @@ -842026,7 +842027,7 @@ sub_81C47B4: ; 81C47B4 movs r1, 0x28 movs r2, 0x40 movs r3, 0x5 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 mov r8, r0 @@ -842255,7 +842256,7 @@ sub_81C4984: ; 81C4984 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r1, [r6] ldr r2, [r1, 0x8] movs r0, 0x3C @@ -842284,9 +842285,9 @@ sub_81C49E0: ; 81C49E0 ldr r0, =0x0203cf1c ldr r0, [r0] ldr r0, [r0, 0x8] - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, =0x00007533 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 bl sub_81C4984 pop {r4} @@ -842316,7 +842317,7 @@ sub_81C4A08: ; 81C4A08 movs r1, 0x10 movs r2, 0x88 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront ldr r2, =0x0203cf1c ldr r1, [r2] ldr r3, =0x000040d4 @@ -842363,7 +842364,7 @@ sub_81C4A88: ; 81C4A88 movs r1, 0x40 movs r2, 0x98 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront strb r0, [r4] @081C4AA6: ldr r0, [r5] @@ -842382,7 +842383,7 @@ sub_81C4A88: ; 81C4A88 subs r1, r2, 0x1 lsls r1, 24 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim movs r0, 0x2 movs r1, 0 bl sub_81C4204 @@ -842438,7 +842439,7 @@ sub_81C4AF8: ; 81C4AF8 ldr r0, =gUnknown_0861D084 movs r2, 0x28 mov r3, r9 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r1, r7, r5 strb r0, [r1] adds r4, r1, 0 @@ -842450,7 +842451,7 @@ sub_81C4AF8: ; 81C4AF8 lsls r0, 2 adds r0, r6 movs r1, 0x4 - bl obj_anim_image_start + bl StartObjectImageAnim b @081C4B9A .pool @081C4B74: @@ -842462,7 +842463,7 @@ sub_81C4AF8: ; 81C4AF8 lsls r0, 2 adds r0, r6 movs r1, 0x5 - bl obj_anim_image_start + bl StartObjectImageAnim b @081C4B9A @081C4B8A: ldrb r1, [r4] @@ -842471,7 +842472,7 @@ sub_81C4AF8: ; 81C4AF8 lsls r0, 2 adds r0, r6 movs r1, 0x6 - bl obj_anim_image_start + bl StartObjectImageAnim @081C4B9A: ldrb r1, [r4] lsls r0, r1, 4 @@ -842646,7 +842647,7 @@ sub_81C4C84: ; 81C4C84 mov r2, r8 @081C4CE4: lsrs r1, r2, 24 - bl obj_anim_image_start + bl StartObjectImageAnim b @081C4D02 @081C4CEC: adds r0, r5, r4 @@ -842658,7 +842659,7 @@ sub_81C4C84: ; 81C4C84 adds r1, r6, 0x6 lsls r1, 24 lsrs r1, 24 - bl obj_anim_image_start + bl StartObjectImageAnim @081C4D02: adds r0, r4, 0x1 lsls r0, 24 @@ -843032,8 +843033,8 @@ sub_81C4F98: ; 81C4F98 sub_81C501C: ; 81C501C push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl do_scheduled_bg_tilemap_copies_to_vram bl fade_and_return_progress_probably pop {r0} @@ -843043,8 +843044,8 @@ sub_81C501C: ; 81C501C thumb_func_start sub_81C5038 sub_81C5038: ; 81C5038 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -843120,7 +843121,7 @@ sub_81C5078: ; 81C5078 bl remove_some_task b @081C51A2 @081C50F4: - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator b @081C51A2 @081C50FA: bl sub_80A1A74 @@ -843131,7 +843132,7 @@ sub_81C5078: ; 81C5078 b @081C51A0 .pool @081C510C: - bl reset_all_obj_data + bl ResetAllObjectData b @081C51A2 @081C5112: bl sub_81221AC @@ -843240,7 +843241,7 @@ sub_81C51DC: ; 81C51DC ldr r1, [r0] adds r1, 0x4 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap bl sub_8121E10 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram @@ -843308,7 +843309,7 @@ sub_81C5238: ; 81C5238 ldr r4, =0x0203cf2c ldr r1, [r4] adds r1, 0x4 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r1, [r4] b @081C52DC .pool @@ -843321,7 +843322,7 @@ sub_81C5238: ; 81C5238 .pool @081C52C8: ldr r0, =gUnknown_0861F3CC - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic b @081C52D8 .pool @081C52D4: @@ -844363,8 +844364,8 @@ sub_81C5B4C: ; 81C5B4C bl SetMainCallback2 @081C5B9E: bl sub_81C56CC - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator bl FreeAllWindowBuffers ldr r0, =0x0203cf2c ldr r0, [r0] @@ -845415,7 +845416,7 @@ sub_81C64B4: ; 81C64B4 movs r1, 0 bl sub_8198070 movs r0, 0x3 - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram adds r0, r5, 0 @@ -845433,7 +845434,7 @@ sub_81C64B4: ; 81C64B4 movs r1, 0 bl sub_8198070 movs r0, 0x3 - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram adds r0, r6, 0 @@ -846191,9 +846192,9 @@ sub_81C6BD8: ; 81C6BD8 cmp r4, 0x4 bls @081C6C04 movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram movs r0, 0x1 @@ -846374,7 +846375,7 @@ sub_81C6D6C: ; 81C6D6C movs r1, 0 bl sub_8198070 ldrb r0, [r4] - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r4] bl RemoveWindow movs r0, 0x1 @@ -846452,7 +846453,7 @@ sub_81C6E1C: ; 81C6E1C movs r1, 0 bl sub_8197DF8 movs r0, 0x2 - bl ClearWindowTileMap + bl ClearWindowTilemap movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram pop {r0} @@ -846475,9 +846476,9 @@ sub_81C6E38: ; 81C6E38 ldr r0, =0x00001024 adds r4, r0 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag ldrb r1, [r5] lsls r0, r1, 4 adds r0, r1 @@ -846490,7 +846491,7 @@ sub_81C6E38: ; 81C6E38 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0xFF strb r0, [r5] @081C6E80: @@ -846509,7 +846510,7 @@ sub_81C6E98: ; 81C6E98 adds r4, r0, 0 ldr r0, =gUnknown_08D9ADD0 adds r1, r4, 0 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000ca9 @@ -846526,7 +846527,7 @@ sub_81C6E98: ; 81C6E98 orrs r0, r1 str r0, [sp, 0x4] mov r0, sp - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette adds r0, r4, 0 bl Free add sp, 0x8 @@ -846547,7 +846548,7 @@ sub_81C6EF4: ; 81C6EF4 movs r1, 0x44 movs r2, 0x38 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront strb r0, [r4] pop {r4} pop {r0} @@ -846627,9 +846628,9 @@ sub_81C6F90: ; 81C6F90 ldr r0, =0x00001025 adds r4, r0 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag adds r0, r4, 0 adds r1, r4, 0 adds r2, r6, 0 @@ -847023,8 +847024,8 @@ sub_81C72BC: ; 81C72BC movs r0, 0x1 strh r0, [r1, 0x8] bl clear_tasks - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator movs r0, 0 bl SetVBlankCallback ldr r0, =sub_81C742C @@ -847155,8 +847156,8 @@ sub_81C7388: ; 81C7388 sub_81C7400: ; 81C7400 push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r0} bx r0 @@ -847166,8 +847167,8 @@ sub_81C7400: ; 81C7400 sub_81C7418: ; 81C7418 push {lr} bl copy_pal_bg_faded_to_pal_ram - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests pop {r0} bx r0 thumb_func_end sub_81C7418 @@ -847522,8 +847523,8 @@ sub_81C76C4: ; 81C76C4 adds r4, r0, 0 cmp r4, 0 beq @081C76F4 - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator ldr r0, =sub_81C7764 movs r1, 0x1 bl sub_81C7078 @@ -847639,18 +847640,18 @@ sub_81C7764: ; 81C7764 adds r4, 0x2C movs r0, 0 adds r1, r4, 0 - bl SetBgTileMap + bl SetBgTilemap ldr r1, =gUnknown_08DC7D84 movs r0, 0 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer ldr r0, =gUnknown_08DC7B60 movs r1, 0 movs r2, 0x20 bl sub_81C7944 movs r0, 0 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0 b @081C782C .pool @@ -847868,7 +847869,7 @@ sub_81C795C: ; 81C795C cmp r0, 0 beq @081C7988 ldrh r0, [r4, 0x4] - bl gpu_pal_alloc_new + bl AllocObjectPalette lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xFF @@ -848152,7 +848153,7 @@ sub_81C7B74: ; 81C7B74 str r0, [r4, 0x10] bl sub_81C7BF8 ldrb r0, [r4, 0x10] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r4, 0x10] movs r1, 0x3 bl CopyWindowToVram @@ -848238,7 +848239,7 @@ sub_81C7C28: ; 81C7C28 ldr r4, =gUnknown_0861FA4C @081C7C36: adds r0, r4, 0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic adds r4, 0x8 adds r5, 0x1 cmp r5, 0 @@ -848246,7 +848247,7 @@ sub_81C7C28: ; 81C7C28 ldr r0, =gUnknown_0861FA54 bl sub_81C795C movs r0, 0 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 24 movs r1, 0x80 @@ -848260,7 +848261,7 @@ sub_81C7C28: ; 81C7C28 movs r1, 0xDC movs r2, 0xC movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -848281,11 +848282,11 @@ sub_81C7C94: ; 81C7C94 movs r0, 0 bl sub_81C763C ldr r0, [r0, 0x18] - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag pop {r0} bx r0 thumb_func_end sub_81C7C94 @@ -848362,11 +848363,11 @@ sub_81C7D28: ; 81C7D28 bl sub_81C763C adds r6, r0, 0 ldr r0, =gUnknown_0861FA64 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic movs r0, 0x1 - bl gpu_pal_alloc_new + bl AllocObjectPalette movs r0, 0x2 - bl gpu_pal_alloc_new + bl AllocObjectPalette movs r5, 0 ldr r0, =0x02020630 mov r8, r0 @@ -848376,7 +848377,7 @@ sub_81C7D28: ; 81C7D28 movs r1, 0 movs r2, 0 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 lsls r4, r5, 2 @@ -848399,7 +848400,7 @@ sub_81C7D28: ; 81C7D28 movs r1, 0 movs r2, 0 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 adds r2, r6, 0 @@ -848471,13 +848472,13 @@ sub_81C7E14: ; 81C7E14 cmp r4, 0x4 bne @081C7E30 movs r0, 0x2 - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag ldr r3, [r5, 0x20] adds r0, 0x20 b @081C7E3A @081C7E30: movs r0, 0x2 - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag ldr r3, [r5, 0x20] adds r0, 0x40 @081C7E3A: @@ -848521,7 +848522,7 @@ sub_81C7E58: ; 81C7E58 ldr r0, =gUnknown_08DC7F00 adds r4, r0 movs r0, 0x1 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag adds r1, r0, 0 lsls r1, 24 lsrs r1, 4 @@ -848537,7 +848538,7 @@ sub_81C7E58: ; 81C7E58 adds r1, r4, 0 bl LZ77UnCompWram movs r0, 0x2 - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag adds r1, r0, 0 lsls r1, 16 lsrs r1, 11 @@ -848550,7 +848551,7 @@ sub_81C7E58: ; 81C7E58 movs r3, 0x1 bl RequestDma3Copy movs r0, 0x2 - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag ldr r3, [r7, 0x20] ldrh r1, [r6, 0x4] adds r0, r1 @@ -848603,7 +848604,7 @@ sub_81C7F24: ; 81C7F24 ldr r0, =gUnknown_08DC7F00 adds r4, r0 movs r0, 0x2 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag adds r1, r0, 0 lsls r1, 24 lsrs r1, 4 @@ -848619,7 +848620,7 @@ sub_81C7F24: ; 81C7F24 adds r1, r4, 0 bl LZ77UnCompWram movs r0, 0x2 - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag adds r1, r0, 0 lsls r1, 16 lsrs r1, 11 @@ -849114,7 +849115,7 @@ sub_81C82E4: ; 81C82E4 ldrb r0, [r5] adds r1, r5, 0 adds r1, 0x88 - bl SetBgTileMap + bl SetBgTilemap ldrb r0, [r5] movs r1, 0x20 str r1, [sp] @@ -849122,7 +849123,7 @@ sub_81C82E4: ; 81C82E4 adds r1, r4, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 ldrb r0, [r5] movs r1, 0 movs r2, 0 @@ -849137,7 +849138,7 @@ sub_81C82E4: ; 81C82E4 movs r2, 0x2 bl ChangeBgY ldrb r0, [r5] - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0x8 pop {r4,r5} pop {r0} @@ -849152,7 +849153,7 @@ sub_81C835C: ; 81C835C movs r1, 0x11 bl FillWindowPixelBuffer ldrb r0, [r4, 0x8] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r4, 0x8] movs r1, 0x1 bl CopyWindowToVram @@ -850337,7 +850338,7 @@ sub_81C8C64: ; 81C8C64 bl GetWindowAttribute lsls r0, 24 lsrs r0, 24 - bl GetBgTileMap + bl GetBgTilemap adds r2, r0, 0 ldrh r0, [r5, 0xA] lsls r0, 6 @@ -850638,7 +850639,7 @@ sub_81C8ED0: ; 81C8ED0 ldr r4, =gUnknown_0861FBFC @081C8ED6: adds r0, r4, 0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic adds r4, 0x8 adds r5, 0x1 cmp r5, 0 @@ -850668,7 +850669,7 @@ sub_81C8EF8: ; 81C8EF8 adds r2, 0x1 lsls r2, 3 movs r3, 0x7 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r3, r0, 24 lsls r0, r3, 4 @@ -850696,7 +850697,7 @@ sub_81C8EF8: ; 81C8EF8 mov r0, r10 adds r1, r6, 0 movs r3, 0x7 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r3, r0, 24 lsls r2, r3, 4 @@ -850725,7 +850726,7 @@ sub_81C8EF8: ; 81C8EF8 mov r0, r10 adds r1, r6, 0 movs r3, 0x7 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r3, r0, 24 lsls r1, r3, 4 @@ -850760,15 +850761,15 @@ sub_81C8FE0: ; 81C8FE0 push {r4,lr} adds r4, r0, 0 ldr r0, [r4, 0x3C] - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r4, 0x40] - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles ldr r0, [r4, 0x44] - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0xA - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0x14 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag pop {r4} pop {r0} bx r0 @@ -852155,14 +852156,14 @@ sub_81C9A10: ; 81C9A10 adds r1, r5, 0 adds r1, 0x8C movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r1, =gUnknown_08DC9130 movs r0, 0x1 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, =gUnknown_08DC90C0 movs r1, 0x10 movs r2, 0x20 @@ -852800,7 +852801,7 @@ sub_81C9FC4: ; 81C9FC4 ldr r4, =gUnknown_086201C4 @081C9FCA: adds r0, r4, 0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic adds r4, 0x8 adds r5, 0x1 cmp r5, 0x1 @@ -852817,21 +852818,21 @@ sub_81C9FC4: ; 81C9FC4 sub_81C9FEC: ; 81C9FEC push {lr} movs r0, 0x3 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0x1 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0x4 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag movs r0, 0x5 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag movs r0, 0x6 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag movs r0, 0x7 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag movs r0, 0x8 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag movs r0, 0x3 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag bl sub_81CA094 bl sub_81CA698 pop {r0} @@ -852865,7 +852866,7 @@ sub_81CA02C: ; 81CA02C movs r1, 0x8C asrs r2, r5, 16 movs r3, 0x3 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -852907,7 +852908,7 @@ sub_81CA094: ; 81CA094 ldr r0, [r4] bl obj_free_rotscale_entry ldm r4!, {r0} - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles subs r5, 0x1 cmp r5, 0 bge @081CA0AA @@ -852953,7 +852954,7 @@ sub_81CA0EC: ; 81CA0EC bl sub_81C763C mov r10, r0 movs r0, 0x3 - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag lsls r0, 16 lsrs r0, 16 str r0, [sp, 0x4] @@ -853002,7 +853003,7 @@ sub_81CA0EC: ; 81CA0EC adds r0, 0x4 lsls r0, 16 lsrs r0, 16 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag ldr r3, [r4] lsls r0, 4 ldrb r2, [r3, 0x5] @@ -853533,7 +853534,7 @@ sub_81CA4AC: ; 81CA4AC lsrs r2, 6 adds r0, r4, 0 movs r3, 0 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft ldrb r1, [r4, 0x1] movs r0, 0x4 negs r0, r0 @@ -853663,7 +853664,7 @@ sub_81CA640: ; 81CA640 movs r1, 0x10 movs r2, 0x60 movs r3, 0x4 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -853699,7 +853700,7 @@ sub_81CA698: ; 81CA698 movs r0, 0x2 bl sub_81C763C ldr r0, [r0, 0x28] - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles pop {r0} bx r0 thumb_func_end sub_81CA698 @@ -853745,7 +853746,7 @@ sub_81CA6E0: ; 81CA6E0 strh r0, [r4, 0x8] lsls r0, 24 lsrs r0, 24 - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r4, 0x8] movs r1, 0x66 bl FillWindowPixelBuffer @@ -854013,8 +854014,8 @@ sub_81CA8B0: ; 81CA8B0 sub_81CA914: ; 81CA914 push {lr} bl copy_pal_bg_faded_to_pal_ram - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl sub_80BA0A8 pop {r0} bx r0 @@ -855390,14 +855391,14 @@ sub_81CB324: ; 81CB324 ldr r0, =0x00001024 adds r1, r5, r0 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap ldr r1, =gUnknown_086225D4 movs r0, 0x2 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, =gUnknown_08622510 movs r1, 0x20 movs r2, 0x20 @@ -855420,7 +855421,7 @@ sub_81CB324: ; 81CB324 adds r1, r5, 0 adds r1, 0x24 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap movs r1, 0x80 lsls r1, 5 movs r0, 0x20 @@ -855430,14 +855431,14 @@ sub_81CB324: ; 81CB324 movs r0, 0x1 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 ldr r0, =gUnknown_086226E0 movs r1, 0x10 movs r2, 0x20 bl sub_81C7944 movs r0, 0x1 @081CB418: - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0 b @081CB506 .pool @@ -856579,7 +856580,7 @@ sub_81CBCEC: ; 81CBCEC bl GetWindowAttribute lsls r0, 24 lsrs r0, 24 - bl GetBgTileMap + bl GetBgTilemap adds r6, r0, 0 lsls r4, 7 adds r4, 0x3A @@ -856623,7 +856624,7 @@ sub_81CBD48: ; 81CBD48 bl GetWindowAttribute lsls r0, 24 lsrs r0, 24 - bl GetBgTileMap + bl GetBgTilemap lsls r4, 7 adds r4, 0x3A adds r0, r4 @@ -856652,12 +856653,12 @@ sub_81CBD78: ; 81CBD78 movs r1, 0x11 bl FillWindowPixelBuffer ldrb r0, [r4, 0x10] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r4, 0x12] movs r1, 0x11 bl FillWindowPixelBuffer ldrb r0, [r4, 0x12] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r4, 0x10] movs r1, 0x1 bl CopyWindowToVram @@ -857025,7 +857026,7 @@ sub_81CC058: ; 81CC058 movs r1, 0x11 bl FillWindowPixelBuffer ldrb r0, [r4, 0x14] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r4, 0x14] movs r1, 0x3 bl CopyWindowToVram @@ -857057,7 +857058,7 @@ sub_81CC09C: ; 81CC09C movs r1, 0x11 bl FillWindowPixelBuffer ldrb r0, [r4, 0x14] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r4, 0x14] movs r1, 0x3 bl CopyWindowToVram @@ -857222,9 +857223,9 @@ sub_81CC1DC: ; 81CC1DC movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0x8 pop {r0} bx r0 @@ -857251,7 +857252,7 @@ sub_81CC214: ; 81CC214 ldr r4, =gUnknown_08622810 @081CC224: adds r0, r4, 0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic adds r4, 0x8 adds r5, 0x1 cmp r5, 0 @@ -857276,7 +857277,7 @@ sub_81CC214: ; 81CC214 orrs r0, r1 str r0, [sp, 0x4] mov r0, sp - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r2, =0x00001824 adds r1, r6, r2 lsls r0, 16 @@ -857285,7 +857286,7 @@ sub_81CC214: ; 81CC214 adds r0, r2 str r0, [r1] movs r0, 0xD - bl gpu_pal_alloc_new + bl AllocObjectPalette lsls r0, 24 lsrs r0, 20 movs r1, 0x80 @@ -857315,21 +857316,21 @@ sub_81CC2B4: ; 81CC2B4 ldr r0, [r4, 0x1C] cmp r0, 0 beq @081CC2C8 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @081CC2C8: ldr r0, [r4, 0x20] cmp r0, 0 beq @081CC2D2 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @081CC2D2: movs r0, 0x8 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0x7 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0xC - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag movs r0, 0xD - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag pop {r4} pop {r0} bx r0 @@ -857347,7 +857348,7 @@ sub_81CC2F0: ; 81CC2F0 movs r1, 0x4 movs r2, 0x50 movs r3, 0x5 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -857371,7 +857372,7 @@ sub_81CC330: ; 81CC330 push {r4,lr} adds r4, r0, 0 ldr r0, [r4, 0x1C] - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0 str r0, [r4, 0x1C] pop {r4} @@ -857417,7 +857418,7 @@ sub_81CC370: ; 81CC370 movs r1, 0x2C movs r2, 0x68 movs r3, 0x6 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -857446,7 +857447,7 @@ sub_81CC39C: ; 81CC39C adds r5, r7, r1 adds r1, r5, 0 movs r2, 0 - bl sub_80345F0 + bl DecompressPicFromTable ldr r0, =gTrainerFrontPicPaletteTable adds r4, r0 ldr r0, [r4] @@ -857831,8 +857832,8 @@ sub_81CC670: ; 81CC670 sub_81CC6A4: ; 81CC6A4 push {lr} bl copy_pal_bg_faded_to_pal_ram - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl sub_81237B4 pop {r0} bx r0 @@ -858223,7 +858224,7 @@ sub_81CC9C0: ; 81CC9C0 ldr r4, =gUnknown_086230F8 @081CC9C6: adds r0, r4, 0 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic adds r4, 0x8 adds r5, 0x1 cmp r5, 0 @@ -858244,15 +858245,15 @@ sub_81CC9EC: ; 81CC9EC bl sub_81C763C adds r4, r0, 0 movs r0, 0x6 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0xB - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag adds r5, r4, 0 adds r5, 0xC movs r4, 0x2 @081CCA08: ldm r5!, {r0} - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles subs r4, 0x1 cmp r4, 0 bge @081CCA08 @@ -858289,7 +858290,7 @@ sub_81CCA1C: ; 81CCA1C bl CpuSet movs r0, 0x1 adds r1, r4, 0 - bl SetBgTileMap + bl SetBgTilemap ldr r0, =gUnknown_08623110 bl AddWindow movs r4, 0 @@ -858313,7 +858314,7 @@ sub_81CCA1C: ; 81CCA1C movs r1, 0x11 bl FillWindowPixelBuffer ldrb r0, [r5, 0x8] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r5, 0x8] movs r1, 0x3 bl CopyWindowToVram @@ -858397,7 +858398,7 @@ sub_81CCB0C: ; 81CCB0C movs r1, 0 movs r2, 0 movs r3, 0xC - bl PutWindowRectTileMap + bl PutWindowRectTilemap ldrb r0, [r4, 0x8] adds r2, r5, 0x4 movs r1, 0x1 @@ -858429,7 +858430,7 @@ sub_81CCB0C: ; 81CCB0C movs r1, 0 movs r2, 0 movs r3, 0xC - bl PutWindowRectTileMap + bl PutWindowRectTilemap ldrb r0, [r4, 0x8] adds r2, r5, 0x4 movs r1, 0x1 @@ -858451,7 +858452,7 @@ sub_81CCB0C: ; 81CCB0C movs r0, 0x1 movs r2, 0x11 movs r3, 0x6 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect b @081CCC0C .pool @081CCBDC: @@ -858459,7 +858460,7 @@ sub_81CCB0C: ; 81CCB0C movs r1, 0x11 bl FillWindowPixelBuffer ldrb r0, [r4, 0x8] - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r4, 0x8] adds r2, r5, 0x4 movs r1, 0x1 @@ -858493,9 +858494,9 @@ sub_81CCB0C: ; 81CCB0C movs r0, 0x1 movs r2, 0x11 movs r3, 0x4 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0x1 bl sub_81CCFA4 @081CCC40: @@ -858694,7 +858695,7 @@ sub_81CCD70: ; 81CCD70 movs r0, 0x1 movs r2, 0x11 movs r3, 0x6 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r0, 0xC8 adds r1, r4, 0 muls r1, r0 @@ -858707,7 +858708,7 @@ sub_81CCD70: ; 81CCD70 movs r0, 0x1 movs r2, 0x12 movs r3, 0x6 - bl CopyToBgTileMapBufferRect + bl CopyToBgTilemapBufferRect @081CCDD4: add sp, 0x8 pop {r4-r6} @@ -858799,7 +858800,7 @@ sub_81CCE58: ; 81CCE58 ldr r0, =gUnknown_086231D0 asrs r2, r7, 16 movs r3, 0x8 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r2, r0, 4 @@ -860475,7 +860476,7 @@ sub_81CDB98: ; 81CDB98 str r2, [sp] adds r2, r4, 0 adds r3, r5, 0 - bl sub_8034654 + bl DecompressMonPic adds r0, r4, 0 mov r1, r8 adds r2, r5, 0 @@ -860926,7 +860927,7 @@ sub_81CDE94: ; 81CDE94 bl LZ77UnCompVram movs r0, 0x3 adds r1, r4, 0 - bl SetBgTileMap + bl SetBgTilemap bl sub_81CDD5C cmp r0, 0x1 bne @081CDFF2 @@ -860938,10 +860939,10 @@ sub_81CDE94: ; 81CDE94 movs r0, 0x3 movs r2, 0 movs r3, 0x5 - bl CopyToBgTileMapBufferRect + bl CopyToBgTilemapBufferRect @081CDFF2: movs r0, 0x3 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, =gUnknown_08DC6528 movs r1, 0x10 movs r2, 0x20 @@ -860970,9 +860971,9 @@ sub_81CDE94: ; 81CDE94 bl LZ77UnCompVram movs r0, 0x2 adds r1, r4, 0 - bl SetBgTileMap + bl SetBgTilemap movs r0, 0x2 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, =gUnknown_086231E8 movs r1, 0x30 movs r2, 0x20 @@ -861002,7 +861003,7 @@ sub_81CDE94: ; 81CDE94 bl CpuSet movs r0, 0x1 adds r1, r4, 0 - bl SetBgTileMap + bl SetBgTilemap b @081CDFB0 .pool @081CE0B0: @@ -861099,7 +861100,7 @@ sub_81CDE94: ; 81CDE94 lsls r1, 5 adds r0, r5, r1 ldrb r0, [r0] - bl PutWindowTileMap + bl PutWindowTilemap bl sub_81CDD5C cmp r0, 0x1 beq @081CE19C @@ -861108,15 +861109,15 @@ sub_81CDE94: ; 81CDE94 ldr r2, =0x00001821 adds r0, r5, r2 ldrb r0, [r0] - bl PutWindowTileMap + bl PutWindowTilemap ldr r1, =0x00001822 adds r0, r5, r1 ldrb r0, [r0] - bl PutWindowTileMap + bl PutWindowTilemap ldr r2, =0x00001823 adds r0, r5, r2 ldrb r0, [r0] - bl PutWindowTileMap + bl PutWindowTilemap b @081CDFB0 .pool @081CE1C8: @@ -862043,12 +862044,12 @@ sub_81CE964: ; 81CE964 bne @081CE982 adds r0, r5, 0 movs r1, 0 - bl obj_anim_image_start + bl StartObjectImageAnim b @081CE98A @081CE982: adds r0, r5, 0 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim @081CE98A: pop {r4,r5} pop {r0} @@ -862074,7 +862075,7 @@ sub_81CE990: ; 81CE990 @081CE9B0: movs r0, 0x66 @081CE9B2: - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 4 ldrb r2, [r5, 0x5] movs r1, 0xF @@ -862095,7 +862096,7 @@ sub_81CE9C8: ; 81CE9C8 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl obj_anim_image_start + bl StartObjectImageAnim pop {r4} pop {r0} bx r0 @@ -862150,7 +862151,7 @@ sub_81CE9E4: ; 81CE9E4 adds r1, r6, r2 str r0, [r1] movs r0, 0x69 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 24 movs r1, 0 @@ -862161,7 +862162,7 @@ sub_81CE9E4: ; 81CE9E4 .pool @081CEA78: mov r0, sp - bl gpu_tile_obj_alloc_and_load_multiple + bl LoadObjectPics mov r0, r10 bl sub_81C795C movs r4, 0 @@ -862179,7 +862180,7 @@ sub_81CE9E4: ; 81CE9E4 adds r0, r7, 0 movs r1, 0xE2 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 @@ -862238,7 +862239,7 @@ sub_81CE9E4: ; 81CE9E4 adds r0, r7, 0 movs r1, 0xE6 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 @@ -862280,7 +862281,7 @@ sub_81CE9E4: ; 81CE9E4 adds r0, r7, 0 movs r1, 0xDE movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 @@ -862319,7 +862320,7 @@ sub_81CE9E4: ; 81CE9E4 mov r1, r10 bl sub_81D32B0 mov r0, r8 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic movs r0, 0 mov r3, r10 str r0, [r3, 0x8] @@ -862346,15 +862347,15 @@ sub_81CEBF4: ; 81CEBF4 ldr r1, =0x000028dc adds r0, r5, r1 ldr r0, [r0] - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0x6A - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0x69 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0x6A - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag movs r0, 0x69 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag b @081CEC68 .pool @081CEC28: @@ -862369,22 +862370,22 @@ sub_81CEBF4: ; 81CEBF4 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x6 bls @081CEC2A movs r0, 0x65 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0x66 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0x67 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0x65 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag movs r0, 0x66 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag @081CEC68: ldr r0, =0x00001816 adds r1, r5, r0 @@ -862397,11 +862398,11 @@ sub_81CEBF4: ; 81CEBF4 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0x64 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0x64 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag @081CEC8E: pop {r4,r5} pop {r0} @@ -862500,14 +862501,14 @@ sub_81CED30: ; 81CED30 bl sub_81CDCD4 str r0, [sp, 0x20] adds r0, r4, 0 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette lsls r0, 24 lsrs r0, 24 ldr r4, =0x00001818 add r4, r8 strh r0, [r4] adds r0, r5, 0 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic ldr r5, =0x0000181a add r5, r8 strh r0, [r5] @@ -862515,16 +862516,16 @@ sub_81CED30: ; 81CED30 movs r1, 0x26 movs r2, 0x68 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 strb r0, [r7] cmp r0, 0x40 bne @081CEDBC movs r0, 0x64 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0x64 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag movs r0, 0xFF strb r0, [r7] b @081CEE26 @@ -862589,8 +862590,8 @@ sub_81CEE44: ; 81CEE44 push {r4,lr} bl sub_81CDC70 adds r4, r0, 0 - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram adds r0, r4, 0 bl sub_81D2108 @@ -863413,20 +863414,20 @@ sub_81CF418: ; 81CF418 adds r1, r5, 0 adds r1, 0x10 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r1, =gUnknown_086234AC movs r0, 0x1 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram ldr r0, =gUnknown_086233C4 movs r1, 0x10 movs r2, 0x20 bl sub_81C7944 movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @081CF498: movs r0, 0 b @081CF570 @@ -863865,7 +863866,7 @@ sub_81CF7C8: ; 81CF7C8 strh r0, [r4, 0x8] lsls r0, 24 lsrs r0, 24 - bl PutWindowTileMap + bl PutWindowTilemap ldrb r0, [r4, 0x8] movs r1, 0x1 bl CopyWindowToVram @@ -864799,18 +864800,18 @@ sub_81CFEB8: ; 81CFEB8 adds r1, r5, 0 adds r1, 0x10 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r1, =gUnknown_086236CC movs r0, 0x1 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer ldr r0, =gUnknown_086235E4 movs r1, 0x10 movs r2, 0x20 bl sub_81C7944 movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @081CFF32: movs r0, 0 b @081CFFF4 @@ -865239,7 +865240,7 @@ sub_81D024C: ; 81D024C strh r0, [r4, 0x8] lsls r0, 24 lsrs r0, 24 - bl PutWindowTileMap + bl PutWindowTilemap bl sub_81CFB38 adds r2, r0, 0 ldrh r0, [r4, 0x8] @@ -866259,21 +866260,21 @@ sub_81D09F4: ; 81D09F4 adds r0, r4, 0 bl sub_81D1178 movs r0, 0x9 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0xF - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag movs r0, 0x10 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag movs r0, 0x11 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag movs r0, 0x12 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag movs r0, 0x13 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag ldr r0, [r4, 0x14] bl obj_free_rotscale_entry ldr r0, [r4, 0x14] - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0xE bl sub_81C7650 pop {r4} @@ -866336,12 +866337,12 @@ sub_81D0A6C: ; 81D0A6C adds r1, r5, 0 adds r1, 0x1C movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap ldr r1, =gUnknown_08DDE12C movs r0, 0x2 movs r2, 0 movs r3, 0 - bl CopyToBgTileMapBuffer + bl CopyToBgTilemapBuffer ldr r0, =gUnknown_08DDE010 movs r1, 0x10 movs r2, 0x20 @@ -866370,7 +866371,7 @@ sub_81D0A6C: ; 81D0A6C ldr r0, =0x0000081c adds r1, r5, r0 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap movs r0, 0x20 str r0, [sp] movs r0, 0x14 @@ -866379,7 +866380,7 @@ sub_81D0A6C: ; 81D0A6C movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 ldr r0, =gUnknown_08623FF8 movs r1, 0x20 movs r2, 0xA0 @@ -866426,7 +866427,7 @@ sub_81D0A6C: ; 81D0A6C @081D0BBA: movs r0, 0x2 @081D0BBC: - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram movs r0, 0 b @081D0C4A @081D0BC4: @@ -866776,7 +866777,7 @@ sub_81D0E60: ; 81D0E60 strh r0, [r4, 0xA] lsls r0, 24 lsrs r0, 24 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0 bl sub_81D0E84 pop {r4} @@ -866939,7 +866940,7 @@ sub_81D0FCC: ; 81D0FCC strh r0, [r4, 0x8] lsls r0, 24 lsrs r0, 24 - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0 bl sub_81D0FF0 pop {r4} @@ -867042,7 +867043,7 @@ sub_81D10A4: ; 81D10A4 movs r1, 0x11 bl FillWindowPixelBuffer ldrb r0, [r4, 0xC] - bl PutWindowTileMap + bl PutWindowTilemap adds r0, r4, 0 bl sub_81D10D0 pop {r4} @@ -867368,7 +867369,7 @@ sub_81D12D8: ; 81D12D8 bcc @081D1322 @081D133A: movs r0, 0x1 - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram pop {r4-r6} pop {r0} bx r0 @@ -867387,7 +867388,7 @@ sub_81D1350: ; 81D1350 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 add sp, 0x8 pop {r0} bx r0 @@ -867424,7 +867425,7 @@ sub_81D1370: ; 81D1370 add r1, sp, 0x8 adds r2, r5, 0 adds r3, r4, 0 - bl CopyToBgTileMapBufferRect + bl CopyToBgTilemapBufferRect add sp, 0x10 pop {r4-r6} pop {r0} @@ -867470,14 +867471,14 @@ sub_81D13FC: ; 81D13FC push {r4,lr} adds r4, r0, 0 ldr r0, =gUnknown_08624C78 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_08624C80 bl sub_81C795C ldr r0, =gUnknown_08624D04 movs r1, 0 movs r2, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -867527,7 +867528,7 @@ sub_81D1448: ; 81D1448 bl sub_81D0954 adds r4, r0, 0 movs r0, 0x9 - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag ldr r3, [r6, 0x14] ldr r1, =gUnknown_08624BF8 lsls r4, 2 @@ -867547,7 +867548,7 @@ sub_81D1448: ; 81D1448 adds r0, 0xF lsls r0, 16 lsrs r0, 16 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag ldr r3, [r6, 0x14] lsls r0, 4 ldrb r2, [r3, 0x5] @@ -868776,7 +868777,7 @@ sub_81D1D04: ; 81D1D04 movs r1, 0 bl sub_8198070 ldrb r0, [r4] - bl ClearWindowTileMap + bl ClearWindowTilemap ldrb r0, [r4] bl RemoveWindow movs r0, 0xFF @@ -870274,7 +870275,7 @@ sub_81D2824: ; 81D2824 cmp r5, 0 bne @081D287C movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 movs r1, 0 movs r2, 0x1 @@ -870284,7 +870285,7 @@ sub_81D2824: ; 81D2824 .pool @081D287C: movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x1 movs r1, 0 movs r2, 0x1 @@ -870292,9 +870293,9 @@ sub_81D2824: ; 81D2824 bl SetWindowBorderStyle @081D288E: movs r0, 0x2 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x3 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x2 movs r1, 0 movs r2, 0x1 @@ -871351,7 +871352,7 @@ sub_81D3094: ; 81D3094 mov r1, r8 adds r2, r4, 0 adds r3, r5, 0 - bl sub_8034654 + bl DecompressMonPic adds r0, r4, 0 adds r1, r6, 0 adds r2, r5, 0 @@ -871854,7 +871855,7 @@ sub_81D3480: ; 81D3480 movs r1, 0 movs r2, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r3, r0, 24 adds r6, r3, 0 @@ -871925,7 +871926,7 @@ sub_81D3520: ; 81D3520 ldr r0, [r4] cmp r0, 0 beq @081D3544 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0 str r0, [r4] adds r0, r5, 0x1 @@ -871943,9 +871944,9 @@ sub_81D354C: ; 81D354C push {lr} bl sub_81D3520 movs r0, 0x68 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag movs r0, 0x68 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag pop {r0} bx r0 thumb_func_end sub_81D354C @@ -871966,7 +871967,7 @@ sub_81D3564: ; 81D3564 bne @081D35DC adds r0, r4, 0 movs r1, 0 - bl obj_anim_image_seek + bl SeekObjectImageAnim adds r2, r4, 0 adds r2, 0x3E ldrb r1, [r2] @@ -872042,7 +872043,7 @@ sub_81D35E8: ; 81D35E8 adds r4, r0 adds r0, r4, 0 movs r1, 0 - bl obj_anim_image_seek + bl SeekObjectImageAnim adds r1, r4, 0 adds r1, 0x3E ldrb r0, [r1] @@ -874645,9 +874646,9 @@ sub_81D4A90: ; 81D4A90 @081D4B3A: ldr r4, =gFieldEffectObjectPaletteInfo1 adds r0, r4, 0 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette ldrh r0, [r4, 0x4] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r0, 24 bl sub_80ABE18 @@ -874680,7 +874681,7 @@ sub_81D4A90: ; 81D4A90 subs r3, 0x1 lsls r3, 24 lsrs r3, 24 - bl obj_add_from_template_backward_search + bl AddObjectToBack ldr r1, =0x0203cf50 strb r0, [r1] lsls r0, 24 @@ -874728,7 +874729,7 @@ sub_81D4BEC: ; 81D4BEC lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles @081D4C06: pop {r0} bx r0 @@ -876817,7 +876818,7 @@ sub_81D5C8C: ; 81D5C8C cmp r0, 0x3 ble @081D5CD6 movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 movs r1, 0x3 bl CopyWindowToVram @@ -878037,9 +878038,9 @@ sub_81D6774: ; 81D6774 bl vblank_hblank_handler_set_zero bl clear_scheduled_bg_copies_to_vram bl remove_some_task - bl gpu_pal_allocator_reset + bl ResetObjectPaletteAllocator bl sub_80A1A74 - bl reset_all_obj_data + bl ResetAllObjectData bl clear_tasks movs r0, 0 movs r1, 0xF0 @@ -878067,8 +878068,8 @@ sub_81D6774: ; 81D6774 sub_81D67D0: ; 81D67D0 push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl do_scheduled_bg_tilemap_copies_to_vram bl fade_and_return_progress_probably pop {r0} @@ -878078,8 +878079,8 @@ sub_81D67D0: ; 81D67D0 thumb_func_start sub_81D67EC sub_81D67EC: ; 81D67EC push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -878096,8 +878097,8 @@ sub_81D6800: ; 81D6800 ands r0, r1 cmp r0, 0 bne @081D6830 - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator ldr r4, =0x0203cf60 ldr r0, [r4] ldr r0, [r0] @@ -878273,7 +878274,7 @@ sub_81D6984: ; 81D6984 movs r1, 0x58 movs r2, 0x48 movs r3, 0x3 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 @@ -878293,7 +878294,7 @@ sub_81D6984: ; 81D6984 movs r1, 0x38 movs r2, 0x68 movs r3, 0x3 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 strh r0, [r4] @@ -878301,7 +878302,7 @@ sub_81D6984: ; 81D6984 movs r1, 0x4B movs r2, 0x65 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2] @@ -878309,7 +878310,7 @@ sub_81D6984: ; 81D6984 movs r1, 0x6D movs r2, 0x72 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x4] @@ -878320,7 +878321,7 @@ sub_81D6984: ; 81D6984 lsls r0, 2 adds r0, r6 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r5, 0 pop {r3} mov r8, r3 @@ -878515,7 +878516,7 @@ sub_81D6B7C: ; 81D6B7C movs r1, 0x88 movs r2, 0x60 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront mov r8, r0 mov r0, r8 lsls r0, 24 @@ -878537,14 +878538,14 @@ sub_81D6B7C: ; 81D6B7C movs r1, 0xA8 movs r2, 0x60 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 8 strh r0, [r4] adds r0, r5, 0 movs r1, 0x88 movs r2, 0x70 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldrh r1, [r4] @@ -878554,14 +878555,14 @@ sub_81D6B7C: ; 81D6B7C movs r1, 0xA8 movs r2, 0x70 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 8 strh r0, [r4, 0x2] adds r0, r5, 0 movs r1, 0x88 movs r2, 0x80 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x2] @@ -878571,14 +878572,14 @@ sub_81D6B7C: ; 81D6B7C movs r1, 0xA8 movs r2, 0x80 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 8 strh r0, [r4, 0x4] adds r0, r5, 0 movs r1, 0x68 movs r2, 0x80 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x4] @@ -878588,14 +878589,14 @@ sub_81D6B7C: ; 81D6B7C movs r1, 0x88 movs r2, 0x80 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 8 strh r0, [r4, 0x6] adds r0, r5, 0 movs r1, 0xB8 movs r2, 0x80 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x6] @@ -878605,14 +878606,14 @@ sub_81D6B7C: ; 81D6B7C movs r1, 0xD0 movs r2, 0x84 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 8 strh r0, [r4, 0x8] ldr r0, =gUnknown_0862A864 movs r1, 0xC8 movs r2, 0x78 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x8] @@ -878626,14 +878627,14 @@ sub_81D6B7C: ; 81D6B7C lsls r0, 2 adds r0, r6 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r6 movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r1, [r4, 0x2] lsls r1, 16 asrs r1, 24 @@ -878642,14 +878643,14 @@ sub_81D6B7C: ; 81D6B7C lsls r0, 2 adds r0, r6 movs r1, 0x3 - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r1, [r4, 0x2] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r6 movs r1, 0x4 - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r1, [r4, 0x4] lsls r1, 16 asrs r1, 24 @@ -878658,14 +878659,14 @@ sub_81D6B7C: ; 81D6B7C lsls r0, 2 adds r0, r6 movs r1, 0x5 - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r6 movs r1, 0x6 - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r1, [r4, 0x6] lsls r1, 16 asrs r1, 24 @@ -878674,14 +878675,14 @@ sub_81D6B7C: ; 81D6B7C lsls r0, 2 adds r0, r6 movs r1, 0x7 - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r1, [r4, 0x6] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r6 movs r1, 0x8 - bl obj_anim_image_start + bl StartObjectImageAnim mov r0, r8 pop {r3} mov r8, r3 @@ -879068,17 +879069,17 @@ sub_81D6FE0: ; 81D6FE0 ldr r1, [r4] adds r1, 0x4 movs r0, 0 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x00000804 adds r1, r0 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x00001004 adds r1, r0 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap bl sub_8121E10 movs r0, 0 bl schedule_bg_copy_tilemap_to_vram @@ -879125,37 +879126,37 @@ sub_81D706C: ; 81D706C ldr r4, =0x0203cf60 ldr r1, [r4] adds r1, 0x4 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r0, =gUnknown_08DA3824 ldr r1, [r4] ldr r2, =0x00000804 adds r1, r2 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r0, =gUnknown_08DA3A88 ldr r1, [r4] ldr r2, =0x00001004 adds r1, r2 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r0, =gUnknown_08DA37E8 movs r1, 0 movs r2, 0x40 bl decompress_palette ldr r0, =gUnknown_0862A8C4 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_0862A8F8 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_0862A924 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_0862A9D4 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_0862AA14 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_0862AA34 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_0862A8CC - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette ldr r0, =gUnknown_0862A9DC - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette add sp, 0x4 pop {r4} pop {r0} @@ -879766,8 +879767,8 @@ sub_81D7600: ; 81D7600 movs r0, 0 bl SetVBlankCallback bl remove_some_task - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator strh r4, [r5] adds r0, r7, 0 subs r0, 0x8 @@ -879791,7 +879792,7 @@ sub_81D7664: ; 81D7664 movs r1, 0x62 movs r2, 0x48 movs r3, 0x3 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 @@ -879811,7 +879812,7 @@ sub_81D7664: ; 81D7664 movs r1, 0x42 movs r2, 0x68 movs r3, 0x3 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 strh r0, [r4] @@ -879819,7 +879820,7 @@ sub_81D7664: ; 81D7664 movs r1, 0x55 movs r2, 0x65 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2] @@ -879827,7 +879828,7 @@ sub_81D7664: ; 81D7664 movs r1, 0x77 movs r2, 0x72 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x4] @@ -879838,7 +879839,7 @@ sub_81D7664: ; 81D7664 lsls r0, 2 adds r0, r6 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r5, 0 pop {r3} mov r8, r3 @@ -880084,7 +880085,7 @@ sub_81D78BC: ; 81D78BC movs r1, 0x7E movs r2, 0x60 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront mov r8, r0 mov r0, r8 lsls r0, 24 @@ -880106,14 +880107,14 @@ sub_81D78BC: ; 81D78BC movs r1, 0x9E movs r2, 0x60 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 8 strh r0, [r4] adds r0, r5, 0 movs r1, 0x7E movs r2, 0x70 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldrh r1, [r4] @@ -880123,14 +880124,14 @@ sub_81D78BC: ; 81D78BC movs r1, 0x9E movs r2, 0x70 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 8 strh r0, [r4, 0x2] adds r0, r5, 0 movs r1, 0x7E movs r2, 0x80 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x2] @@ -880140,14 +880141,14 @@ sub_81D78BC: ; 81D78BC movs r1, 0x9E movs r2, 0x80 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 8 strh r0, [r4, 0x4] adds r0, r5, 0 movs r1, 0x5E movs r2, 0x80 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x4] @@ -880157,14 +880158,14 @@ sub_81D78BC: ; 81D78BC movs r1, 0x7E movs r2, 0x80 movs r3, 0x2 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 8 strh r0, [r4, 0x6] adds r0, r5, 0 movs r1, 0xAE movs r2, 0x80 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x6] @@ -880174,14 +880175,14 @@ sub_81D78BC: ; 81D78BC movs r1, 0xC6 movs r2, 0x84 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 8 strh r0, [r4, 0x8] ldr r0, =gUnknown_0862AA3C movs r1, 0xBE movs r2, 0x78 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x8] @@ -880195,14 +880196,14 @@ sub_81D78BC: ; 81D78BC lsls r0, 2 adds r0, r6 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r6 movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r1, [r4, 0x2] lsls r1, 16 asrs r1, 24 @@ -880211,14 +880212,14 @@ sub_81D78BC: ; 81D78BC lsls r0, 2 adds r0, r6 movs r1, 0x3 - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r1, [r4, 0x2] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r6 movs r1, 0x4 - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r1, [r4, 0x4] lsls r1, 16 asrs r1, 24 @@ -880227,14 +880228,14 @@ sub_81D78BC: ; 81D78BC lsls r0, 2 adds r0, r6 movs r1, 0x5 - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r6 movs r1, 0x6 - bl obj_anim_image_start + bl StartObjectImageAnim ldrh r1, [r4, 0x6] lsls r1, 16 asrs r1, 24 @@ -880243,14 +880244,14 @@ sub_81D78BC: ; 81D78BC lsls r0, 2 adds r0, r6 movs r1, 0x7 - bl obj_anim_image_start + bl StartObjectImageAnim ldrb r1, [r4, 0x6] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r6 movs r1, 0x8 - bl obj_anim_image_start + bl StartObjectImageAnim mov r0, r8 pop {r3} mov r8, r3 @@ -880760,17 +880761,17 @@ sub_81D7E10: ; 81D7E10 ldr r1, [r4] adds r1, 0x4 movs r0, 0 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x00000804 adds r1, r0 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x00001004 adds r1, r0 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap bl sub_8121E10 movs r0, 0 bl schedule_bg_copy_tilemap_to_vram @@ -880830,25 +880831,25 @@ sub_81D7E9C: ; 81D7E9C ldr r4, =0x0203cf60 ldr r1, [r4] adds r1, 0x4 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r0, =gUnknown_08DA60B8 ldr r1, [r4] ldr r2, =0x00000804 adds r1, r2 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r0, =gUnknown_08DA4DEC ldr r1, [r4] ldr r2, =0x00001004 adds r1, r2 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r0, =gUnknown_08DA4DA8 movs r1, 0 movs r2, 0x40 bl decompress_palette ldr r0, =gUnknown_0862AA90 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_0862AA98 - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette add sp, 0x4 pop {r4} pop {r0} @@ -881130,8 +881131,8 @@ sub_81D8164: ; 81D8164 bne @081D8192 movs r0, 0 bl SetVBlankCallback - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -881186,7 +881187,7 @@ sub_81D81A4: ; 81D81A4 adds r2, r3 asrs r2, 16 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 ldr r1, =0x02020630 @@ -881294,22 +881295,22 @@ sub_81D82B0: ; 81D82B0 ldr r1, [r4] adds r1, 0x4 movs r0, 0 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x00000804 adds r1, r0 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x00001004 adds r1, r0 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x00001804 adds r1, r0 movs r0, 0x3 - bl SetBgTileMap + bl SetBgTilemap bl sub_8121E10 movs r0, 0 bl schedule_bg_copy_tilemap_to_vram @@ -881369,12 +881370,12 @@ sub_81D8358: ; 81D8358 ldr r5, =0x0203cf60 ldr r1, [r5] adds r1, 0x4 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r0, =gUnknown_08DA7784 ldr r1, [r5] ldr r4, =0x00001804 adds r1, r4 - bl call_LZZUnCompWram + bl LZDecompressWram str r6, [sp, 0x4] ldr r1, [r5] ldr r0, =0x00001004 @@ -881407,11 +881408,11 @@ sub_81D8358: ; 81D8358 ldr r0, =0x02037b14 strh r1, [r0] ldr r0, =gUnknown_0862AAFC - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_0862AB04 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_0862AB0C - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette add sp, 0xC pop {r4-r7} pop {r0} @@ -881692,8 +881693,8 @@ sub_81D8684: ; 81D8684 bl SetVBlankCallback movs r0, 0 bl SetHBlankCallback - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -881717,7 +881718,7 @@ sub_81D86CC: ; 81D86CC movs r1, 0xA0 movs r2, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 @@ -881732,7 +881733,7 @@ sub_81D86CC: ; 81D86CC negs r2, r2 movs r1, 0xB8 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 mov r1, r8 @@ -881901,22 +881902,22 @@ sub_81D8828: ; 81D8828 ldr r1, [r4] adds r1, 0x4 movs r0, 0 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x00000804 adds r1, r0 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x00001004 adds r1, r0 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x00001804 adds r1, r0 movs r0, 0x3 - bl SetBgTileMap + bl SetBgTilemap bl sub_8121E10 movs r0, 0 bl schedule_bg_copy_tilemap_to_vram @@ -881980,22 +881981,22 @@ sub_81D88D0: ; 81D88D0 ldr r4, =0x0203cf60 ldr r1, [r4] adds r1, 0x4 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r0, =gUnknown_08DA8B40 ldr r1, [r4] ldr r2, =0x00000804 adds r1, r2 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r0, =gUnknown_08DA7FB4 ldr r1, [r4] ldr r2, =0x00001004 adds r1, r2 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r0, =gUnknown_08DA7D6C ldr r1, [r4] ldr r2, =0x00001804 adds r1, r2 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r0, =gUnknown_08DA8E84 movs r1, 0 movs r2, 0x80 @@ -882356,17 +882357,17 @@ sub_81D8C38: ; 81D8C38 ldr r1, [r4] adds r1, 0x4 movs r0, 0 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x00000804 adds r1, r0 movs r0, 0x1 - bl SetBgTileMap + bl SetBgTilemap ldr r1, [r4] ldr r0, =0x00001004 adds r1, r0 movs r0, 0x2 - bl SetBgTileMap + bl SetBgTilemap bl sub_8121E10 movs r0, 0 bl schedule_bg_copy_tilemap_to_vram @@ -882421,40 +882422,40 @@ sub_81D8CC4: ; 81D8CC4 ldr r1, [r4] ldr r2, =0x00000804 adds r1, r2 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r0, =gUnknown_08DAAC1C ldr r1, [r4] adds r1, 0x4 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r0, =gUnknown_08DAAF98 ldr r1, [r4] ldr r2, =0x00001004 adds r1, r2 - bl call_LZZUnCompWram + bl LZDecompressWram ldr r0, =gUnknown_08DAAFEC movs r1, 0 movs r2, 0x60 bl decompress_palette ldr r0, =gUnknown_0862AC28 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_0862AC30 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_0862AC38 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_0862AC40 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_0862AC48 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_0862AC50 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_0862AC58 - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette ldr r0, =gUnknown_0862AC60 - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette ldr r0, =gUnknown_0862AC68 - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette ldr r0, =gUnknown_0862AC70 - bl gpu_pal_obj_decompress_and_apply + bl LoadCompressedObjectPalette add sp, 0x4 pop {r4} pop {r0} @@ -882792,8 +882793,8 @@ sub_81D9034: ; 81D9034 movs r0, 0 bl SetVBlankCallback bl sub_81D6904 - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator ldrb r0, [r4, 0x4] bl remove_task @081D9078: @@ -882837,7 +882838,7 @@ sub_81D90A8: ; 81D90A8 movs r1, 0x40 movs r2, 0x78 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x6] @@ -882853,7 +882854,7 @@ sub_81D90A8: ; 81D90A8 movs r1, 0x10 movs r2, 0x82 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 strh r0, [r7] @@ -882894,7 +882895,7 @@ sub_81D90A8: ; 81D90A8 movs r1, 0xA0 movs r2, 0x80 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x8] @@ -882909,7 +882910,7 @@ sub_81D90A8: ; 81D90A8 movs r1, 0xC0 movs r2, 0x80 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 strh r0, [r7] @@ -882917,7 +882918,7 @@ sub_81D90A8: ; 81D90A8 movs r1, 0xE0 movs r2, 0x80 movs r3, 0x1 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 strh r0, [r7, 0x2] @@ -882964,7 +882965,7 @@ sub_81D90A8: ; 81D90A8 lsls r0, 2 add r0, r8 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim movs r2, 0x2 ldrsh r1, [r7, r2] lsls r0, r1, 4 @@ -882972,13 +882973,13 @@ sub_81D90A8: ; 81D90A8 lsls r0, 2 add r0, r8 movs r1, 0x2 - bl obj_anim_image_start + bl StartObjectImageAnim ldr r0, =gUnknown_0862ACC0 movs r2, 0x41 negs r2, r2 movs r1, 0x78 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0xA] @@ -882994,7 +882995,7 @@ sub_81D90A8: ; 81D90A8 negs r2, r2 movs r1, 0x78 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 strh r0, [r7] @@ -883236,7 +883237,7 @@ sub_81D93D8: ; 81D93D8 lsls r0, 2 adds r0, r3 movs r1, 0x1 - bl obj_anim_image_start + bl StartObjectImageAnim pop {r0} bx r0 .pool @@ -883409,7 +883410,7 @@ sub_81D9528: ; 81D9528 movs r1, 0x98 movs r2, 0x84 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 strh r0, [r7, 0x3C] @@ -883432,7 +883433,7 @@ sub_81D9528: ; 81D9528 movs r1, 0xE0 movs r2, 0x84 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r0, 24 strh r0, [r7, 0x3C] @@ -883812,10 +883813,10 @@ sub_81D9868: ; 81D9868 ldrh r1, [r0, 0x26] strh r1, [r4, 0x26] adds r1, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r4, 0 adds r1, r5, 0 - bl obj_anim_image_start + bl StartObjectImageAnim pop {r4,r5} pop {r0} bx r0 @@ -885614,9 +885615,9 @@ sub_81DA700: ; 81DA700 movs r2, 0x20 bl gpu_pal_apply ldr r0, =gUnknown_0862B724 - bl gpu_tile_obj_decompress_and_load + bl LoadCompressedObjectPic ldr r0, =gUnknown_0862B72C - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette add sp, 0x8 pop {r0} bx r0 @@ -885658,7 +885659,7 @@ sub_81DA74C: ; 81DA74C adds r1, r5, 0 adds r2, r6, 0 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r5, r0, 24 cmp r7, 0x1 @@ -885731,7 +885732,7 @@ sub_81DA74C: ; 81DA74C strh r2, [r0, 0x36] strh r2, [r0, 0x38] adds r1, r7, 0 - bl obj_anim_image_start + bl StartObjectImageAnim adds r0, r6, 0 adds r0, 0x1C adds r4, r0 @@ -885853,7 +885854,7 @@ sub_81DA8BC: ; 81DA8BC adds r1, r6, 0 mov r2, r8 movs r3, 0 - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r6, r0, 24 cmp r5, 0x1 @@ -885921,7 +885922,7 @@ sub_81DA8BC: ; 81DA8BC strh r7, [r0, 0x3A] adds r1, r5, 0 str r2, [sp, 0x8] - bl obj_anim_image_start + bl StartObjectImageAnim ldr r2, [sp, 0x8] adds r0, r2, 0 adds r0, 0x1C @@ -885998,9 +885999,9 @@ sub_81DAA20: ; 81DAA20 adds r5, r0, 0 ldr r4, =0x00002e90 adds r0, r4, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag adds r0, r4, 0 - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag movs r0, 0x10 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -886008,21 +886009,21 @@ sub_81DAA20: ; 81DAA20 lsls r0, 2 ldr r4, =0x02020630 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0x12 ldrsh r1, [r5, r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles movs r0, 0x14 ldrsh r1, [r5, r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r4 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles pop {r4,r5} pop {r0} bx r0 diff --git a/asm/gpu_bg.s b/asm/gpu_bg.s index c2d963058..6c0729f49 100644 --- a/asm/gpu_bg.s +++ b/asm/gpu_bg.s @@ -2,7 +2,7 @@ ; void ResetBgs() ResetBgs: ; 80012F0 push {lr} - bl ResetWramBgControlStructs + bl ResetBgControlStructs ldr r1, =0x030008e0 movs r0, 0 strh r0, [r1, 0x10] @@ -38,12 +38,12 @@ GetBgMode: ; 8001324 .pool thumb_func_end GetBgMode - thumb_func_start ResetWramBgControlStructs -; void ResetWramBgControlStructs() -ResetWramBgControlStructs: ; 8001334 + thumb_func_start ResetBgControlStructs +; void ResetBgControlStructs() +ResetBgControlStructs: ; 8001334 push {lr} ldr r2, =0x030008e0 - ldr r0, =gBgConfigZeroValue + ldr r0, =gZeroedBgControlStruct ldr r0, [r0] adds r1, r2, 0 adds r1, 0xC @@ -55,11 +55,11 @@ ResetWramBgControlStructs: ; 8001334 pop {r0} bx r0 .pool - thumb_func_end ResetWramBgControlStructs + thumb_func_end ResetBgControlStructs - thumb_func_start Unused_ResetWramBgControlStruct -; void Unused_ResetWramBgControlStruct(u8 bg) -Unused_ResetWramBgControlStruct: ; 8001354 + thumb_func_start Unused_ResetBgControlStruct +; void Unused_ResetBgControlStruct(u8 bg) +Unused_ResetBgControlStruct: ; 8001354 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -71,7 +71,7 @@ Unused_ResetWramBgControlStruct: ; 8001354 ldr r1, =0x030008e0 lsls r0, r4, 2 adds r0, r1 - ldr r1, =gBgConfigZeroValue + ldr r1, =gZeroedBgControlStruct ldr r1, [r1] str r1, [r0] @08001372: @@ -79,7 +79,7 @@ Unused_ResetWramBgControlStruct: ; 8001354 pop {r0} bx r0 .pool - thumb_func_end Unused_ResetWramBgControlStruct + thumb_func_end Unused_ResetBgControlStruct thumb_func_start SetBgControlAttributes ; void SetBgControlAttributes(u8 bg, u8 tilesBaseBlock, u8 tileMapBaseBlock, u8 screenSize, u8 paletteMode, u8 priority, u8 mosaic, u8 wraparound) @@ -696,7 +696,7 @@ InitBgsFromTemplates: ; 80017E8 lsls r2, 24 lsrs r4, r2, 24 bl SetBgModeInternal - bl ResetWramBgControlStructs + bl ResetBgControlStructs cmp r4, 0 beq @08001894 movs r7, 0 @@ -949,9 +949,9 @@ LoadBgTiles: ; 8001944 .pool thumb_func_end LoadBgTiles - thumb_func_start LoadBgTileMap -; u8 LoadBgTileMap(u8 bg, void *src, u16 size, u16 destOffset) -LoadBgTileMap: ; 80019FC + thumb_func_start LoadBgTilemap +; u8 LoadBgTilemap(u8 bg, void *src, u16 size, u16 destOffset) +LoadBgTilemap: ; 80019FC push {r4,lr} sub sp, 0x4 lsls r0, 24 @@ -989,7 +989,7 @@ LoadBgTileMap: ; 80019FC pop {r1} bx r1 .pool - thumb_func_end LoadBgTileMap + thumb_func_end LoadBgTilemap thumb_func_start Unused_LoadBgPalette ; u8 Unused_LoadBgPalette(u8 bg, void *src, u16 size, u16 destOffset) @@ -2038,9 +2038,9 @@ Unused_AdjustBgMosaic: ; 8002170 bx r1 thumb_func_end Unused_AdjustBgMosaic - thumb_func_start SetBgTileMap -; void SetBgTileMap(u8 bg, void *tileMap) -SetBgTileMap: ; 8002250 + thumb_func_start SetBgTilemap +; void SetBgTilemap(u8 bg, void *tilemap) +SetBgTilemap: ; 8002250 push {r4,r5,lr} adds r5, r1, 0 lsls r0, 24 @@ -2065,11 +2065,11 @@ SetBgTileMap: ; 8002250 pop {r0} bx r0 .pool - thumb_func_end SetBgTileMap + thumb_func_end SetBgTilemap - thumb_func_start UnsetBgTileMap -; void UnsetBgTileMap(u8 bg) -UnsetBgTileMap: ; 8002284 + thumb_func_start UnsetBgTilemap +; void UnsetBgTilemap(u8 bg) +UnsetBgTilemap: ; 8002284 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -2094,11 +2094,11 @@ UnsetBgTileMap: ; 8002284 pop {r0} bx r0 .pool - thumb_func_end UnsetBgTileMap + thumb_func_end UnsetBgTilemap - thumb_func_start GetBgTileMap -; void *GetBgTileMap(u8 bg) -GetBgTileMap: ; 80022B8 + thumb_func_start GetBgTilemap +; void *GetBgTilemap(u8 bg) +GetBgTilemap: ; 80022B8 push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -2125,11 +2125,11 @@ GetBgTileMap: ; 80022B8 pop {r4} pop {r1} bx r1 - thumb_func_end GetBgTileMap + thumb_func_end GetBgTilemap - thumb_func_start CopyToBgTileMapBuffer -; void CopyToBgTileMapBuffer(u8 bg, void *src, u16 mode, u16 destOffset) -CopyToBgTileMapBuffer: ; 80022F0 + thumb_func_start CopyToBgTilemapBuffer +; void CopyToBgTilemapBuffer(u8 bg, void *src, u16 mode, u16 destOffset) +CopyToBgTilemapBuffer: ; 80022F0 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2187,11 +2187,11 @@ CopyToBgTileMapBuffer: ; 80022F0 pop {r0} bx r0 .pool - thumb_func_end CopyToBgTileMapBuffer + thumb_func_end CopyToBgTilemapBuffer - thumb_func_start CopyBgTileMapBufferToVram -; void CopyBgTileMapBufferToVram(u8 bg) -CopyBgTileMapBufferToVram: ; 800236C + thumb_func_start CopyBgTilemapBufferToVram +; void CopyBgTilemapBufferToVram(u8 bg) +CopyBgTilemapBufferToVram: ; 800236C push {r4,lr} sub sp, 0x4 lsls r0, 24 @@ -2242,11 +2242,11 @@ CopyBgTileMapBufferToVram: ; 800236C pop {r0} bx r0 .pool - thumb_func_end CopyBgTileMapBufferToVram + thumb_func_end CopyBgTilemapBufferToVram - thumb_func_start CopyToBgTileMapBufferRect -; void CopyToBgTileMapBufferRect(u8 bg, void *src, u8 destX, u8 destY, u8 width, u8 height) -CopyToBgTileMapBufferRect: ; 80023D4 + thumb_func_start CopyToBgTilemapBufferRect +; void CopyToBgTilemapBufferRect(u8 bg, void *src, u8 destX, u8 destY, u8 width, u8 height) +CopyToBgTilemapBufferRect: ; 80023D4 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2379,11 +2379,11 @@ CopyToBgTileMapBufferRect: ; 80023D4 pop {r0} bx r0 .pool - thumb_func_end CopyToBgTileMapBufferRect + thumb_func_end CopyToBgTilemapBufferRect - thumb_func_start CopyToBgTileMapBufferRect_ChangePalette -; void CopyToBgTileMapBufferRect_ChangePalette(u8 bg, void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette) -CopyToBgTileMapBufferRect_ChangePalette: ; 80024D8 + thumb_func_start CopyToBgTilemapBufferRect_ChangePalette +; void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette) +CopyToBgTilemapBufferRect_ChangePalette: ; 80024D8 push {r4-r6,lr} sub sp, 0x24 ldr r4, [sp, 0x34] @@ -2412,16 +2412,16 @@ CopyToBgTileMapBufferRect_ChangePalette: ; 80024D8 str r2, [sp, 0x1C] str r2, [sp, 0x20] movs r3, 0 - bl CopyRectToBgTileMapBufferRect + bl CopyRectToBgTilemapBufferRect add sp, 0x24 pop {r4-r6} pop {r0} bx r0 - thumb_func_end CopyToBgTileMapBufferRect_ChangePalette + thumb_func_end CopyToBgTilemapBufferRect_ChangePalette - thumb_func_start CopyRectToBgTileMapBufferRect -; void CopyRectToBgTileMapBufferRect(u8 bg, void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2) -CopyRectToBgTileMapBufferRect: ; 800251C + thumb_func_start CopyRectToBgTilemapBufferRect +; void CopyRectToBgTilemapBufferRect(u8 bg, void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2) +CopyRectToBgTilemapBufferRect: ; 800251C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2665,11 +2665,11 @@ CopyRectToBgTileMapBufferRect: ; 800251C pop {r0} bx r0 .pool - thumb_func_end CopyRectToBgTileMapBufferRect + thumb_func_end CopyRectToBgTilemapBufferRect - thumb_func_start FillBgTileMapBufferRect_Palette0 -; void FillBgTileMapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height) -FillBgTileMapBufferRect_Palette0: ; 8002704 + thumb_func_start FillBgTilemapBufferRect_Palette0 +; void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height) +FillBgTilemapBufferRect_Palette0: ; 8002704 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2800,11 +2800,11 @@ FillBgTileMapBufferRect_Palette0: ; 8002704 pop {r0} bx r0 .pool - thumb_func_end FillBgTileMapBufferRect_Palette0 + thumb_func_end FillBgTilemapBufferRect_Palette0 - thumb_func_start FillBgTileMapBufferRect -; void FillBgTileMapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette) -FillBgTileMapBufferRect: ; 8002804 + thumb_func_start FillBgTilemapBufferRect +; void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette) +FillBgTilemapBufferRect: ; 8002804 push {r4-r6,lr} sub sp, 0x10 ldr r4, [sp, 0x20] @@ -2829,16 +2829,16 @@ FillBgTileMapBufferRect: ; 8002804 str r6, [sp, 0x8] movs r4, 0 str r4, [sp, 0xC] - bl WriteSequenceToBgTileMapBuffer + bl WriteSequenceToBgTilemapBuffer add sp, 0x10 pop {r4-r6} pop {r0} bx r0 - thumb_func_end FillBgTileMapBufferRect + thumb_func_end FillBgTilemapBufferRect - thumb_func_start WriteSequenceToBgTileMapBuffer -; void WriteSequenceToBgTileMapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 width, u8 height, u8 paletteSlot, u16 tileNumDelta) -WriteSequenceToBgTileMapBuffer: ; 8002840 + thumb_func_start WriteSequenceToBgTilemapBuffer +; void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 width, u8 height, u8 paletteSlot, u16 tileNumDelta) +WriteSequenceToBgTilemapBuffer: ; 8002840 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -3048,7 +3048,7 @@ WriteSequenceToBgTileMapBuffer: ; 8002840 pop {r0} bx r0 .pool - thumb_func_end WriteSequenceToBgTileMapBuffer + thumb_func_end WriteSequenceToBgTilemapBuffer thumb_func_start GetBgMetricTextMode ; u16 GetBgMetricTextMode(u8 bg, u8 whichMetric) diff --git a/asm/gpu_obj.s b/asm/gpu_obj.s index df5655356..ad39f7db0 100644 --- a/asm/gpu_obj.s +++ b/asm/gpu_obj.s @@ -1,13 +1,14 @@ - thumb_func_start reset_all_obj_data -reset_all_obj_data: ; 8006974 + thumb_func_start ResetAllObjectData +; void ResetAllObjectData() +ResetAllObjectData: ; 8006974 push {r4,lr} movs r0, 0 movs r1, 0x80 - bl reset_super_sprites - bl obj_delete_all - bl copy_queue_clear + bl ResetSpriteRange + bl RemoveAllObjects + bl ClearObjectCopyRequests bl rotscale_reset_all - bl gpu_tile_obj_tags_reset + bl FreeAllObjectTiles ldr r1, =0x02021b38 movs r0, 0x40 strb r0, [r1] @@ -15,7 +16,7 @@ reset_all_obj_data: ; 8006974 movs r4, 0 strh r4, [r0] movs r0, 0 - bl gpu_tile_obj_alloc + bl AllocObjectTiles ldr r0, =0x02021bbc strh r4, [r0] ldr r0, =0x02021bbe @@ -24,11 +25,11 @@ reset_all_obj_data: ; 8006974 pop {r0} bx r0 .pool - thumb_func_end reset_all_obj_data + thumb_func_end ResetAllObjectData - thumb_func_start call_obj_callbacks -; void call_obj_callbacks() -call_obj_callbacks: ; 80069C0 + thumb_func_start CallObjectCallbacks +; void CallObjectCallbacks() +CallObjectCallbacks: ; 80069C0 push {r4-r7,lr} movs r6, 0 movs r7, 0x1 @@ -54,7 +55,7 @@ call_obj_callbacks: ; 80069C0 cmp r0, 0 beq @080069F6 adds r0, r4, 0 - bl obj_anim_step + bl AnimateObject @080069F6: adds r0, r6, 0x1 lsls r0, 24 @@ -65,15 +66,15 @@ call_obj_callbacks: ; 80069C0 pop {r0} bx r0 .pool - thumb_func_end call_obj_callbacks + thumb_func_end CallObjectCallbacks - thumb_func_start obj_sync_something -; void obj_sync_something() -obj_sync_something: ; 8006A0C + thumb_func_start PrepareSpritesForOamLoad +; void PrepareSpritesForOamLoad() +PrepareSpritesForOamLoad: ; 8006A0C push {r4,r5,lr} - bl update_obj_oam_coords - bl do_something_with_obj_priorites - bl determine_visible_sprites_maybe + bl UpdateObjectOamCoords + bl BuildObjectPriorityList + bl SortObjectsByPriority ldr r5, =0x030022c0 ldr r0, =0x00000439 adds r5, r0 @@ -83,8 +84,8 @@ obj_sync_something: ; 8006A0C movs r1, 0x1 orrs r0, r1 strb r0, [r5] - bl super_sprites_fill - bl copy_rotscale_coeffs_to_super_sprites + bl PopulateSprites + bl CopyTransformationMatricesToSprites movs r2, 0x1 ldrb r1, [r5] movs r0, 0x2 @@ -98,10 +99,11 @@ obj_sync_something: ; 8006A0C pop {r0} bx r0 .pool - thumb_func_end obj_sync_something + thumb_func_end PrepareSpritesForOamLoad - thumb_func_start update_obj_oam_coords -update_obj_oam_coords: ; 8006A58 + thumb_func_start UpdateObjectOamCoords +; void UpdateObjectOamCoords() +UpdateObjectOamCoords: ; 8006A58 push {r4-r7,lr} movs r4, 0 ldr r7, =0x02020630 @@ -193,10 +195,11 @@ update_obj_oam_coords: ; 8006A58 pop {r4-r7} pop {r0} bx r0 - thumb_func_end update_obj_oam_coords + thumb_func_end UpdateObjectOamCoords - thumb_func_start do_something_with_obj_priorites -do_something_with_obj_priorites: ; 8006B1C + thumb_func_start BuildObjectPriorityList +; void BuildObjectPriorityList() +BuildObjectPriorityList: ; 8006B1C push {r4,lr} movs r2, 0 ldr r4, =0x02020630 @@ -226,10 +229,11 @@ do_something_with_obj_priorites: ; 8006B1C pop {r0} bx r0 .pool - thumb_func_end do_something_with_obj_priorites + thumb_func_end BuildObjectPriorityList - thumb_func_start determine_visible_sprites_maybe -determine_visible_sprites_maybe: ; 8006B5C + thumb_func_start SortObjectsByPriority +; void SortObjectsByPriority() +SortObjectsByPriority: ; 8006B5C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -459,11 +463,11 @@ determine_visible_sprites_maybe: ; 8006B5C pop {r0} bx r0 .pool - thumb_func_end determine_visible_sprites_maybe + thumb_func_end SortObjectsByPriority - thumb_func_start copy_rotscale_coeffs_to_super_sprites -; void copy_rotscale_coeffs_to_super_sprites() -copy_rotscale_coeffs_to_super_sprites: ; 8006D1C + thumb_func_start CopyTransformationMatricesToSprites +; void CopyTransformationMatricesToSprites() +CopyTransformationMatricesToSprites: ; 8006D1C push {r4-r6,lr} movs r4, 0 ldr r5, =0x030022c0 @@ -500,11 +504,11 @@ copy_rotscale_coeffs_to_super_sprites: ; 8006D1C pop {r0} bx r0 .pool - thumb_func_end copy_rotscale_coeffs_to_super_sprites + thumb_func_end CopyTransformationMatricesToSprites - thumb_func_start super_sprites_fill -; void super_sprites_fill() -super_sprites_fill: ; 8006D68 + thumb_func_start PopulateSprites +; void PopulateSprites() +PopulateSprites: ; 8006D68 push {r4-r6,lr} sub sp, 0x4 movs r4, 0 @@ -528,7 +532,7 @@ super_sprites_fill: ; 8006D68 bne @08006D9E adds r0, r2, 0 mov r1, sp - bl super_sprite_add + bl AddSprite lsls r0, 24 cmp r0, 0 bne @08006DD8 @@ -569,11 +573,11 @@ super_sprites_fill: ; 8006D68 pop {r0} bx r0 .pool - thumb_func_end super_sprites_fill + thumb_func_end PopulateSprites - thumb_func_start obj_add_from_template_forward_search -; int obj_add_from_template_forward_search(struct objtemplate *template, s16 x, s16 y, u8 y_height_related) -obj_add_from_template_forward_search: ; 8006DF4 + thumb_func_start AddObjectToFront +; u8 AddObjectToFront(struct objtemplate *template, u16 x, u16 y, u8 subpriority) +AddObjectToFront: ; 8006DF4 push {r4-r7,lr} sub sp, 0x4 adds r7, r0, 0 @@ -599,7 +603,7 @@ obj_add_from_template_forward_search: ; 8006DF4 adds r1, r7, 0 asrs r2, r5, 16 asrs r3, r6, 16 - bl template_read + bl AddObject lsls r0, 24 lsrs r0, 24 b @08006E40 @@ -616,11 +620,11 @@ obj_add_from_template_forward_search: ; 8006DF4 pop {r4-r7} pop {r1} bx r1 - thumb_func_end obj_add_from_template_forward_search + thumb_func_end AddObjectToFront - thumb_func_start obj_add_from_template_backward_search -; int obj_add_from_template_backward_search(struct objtemplate *template, s16 x, s16 y, u8 y_height_related) -obj_add_from_template_backward_search: ; 8006E48 + thumb_func_start AddObjectToBack +; u8 AddObjectToBack(struct objtemplate *template, u16 x, u16 y, u8 subpriority) +AddObjectToBack: ; 8006E48 push {r4-r7,lr} mov r7, r8 push {r7} @@ -654,7 +658,7 @@ obj_add_from_template_backward_search: ; 8006E48 adds r1, r7, 0 asrs r2, r4, 16 asrs r3, r5, 16 - bl template_read + bl AddObject lsls r0, 24 lsrs r0, 24 b @08006EA6 @@ -674,7 +678,7 @@ obj_add_from_template_backward_search: ; 8006E48 pop {r4-r7} pop {r1} bx r1 - thumb_func_end obj_add_from_template_backward_search + thumb_func_end AddObjectToBack thumb_func_start obj_add_empty_with_callback ; int obj_add_empty_with_callback(void ( *func)()) @@ -685,7 +689,7 @@ obj_add_empty_with_callback: ; 8006EB4 movs r1, 0 movs r2, 0 movs r3, 0x1F - bl obj_add_from_template_forward_search + bl AddObjectToFront lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 @@ -714,9 +718,9 @@ obj_add_empty_with_callback: ; 8006EB4 bx r1 thumb_func_end obj_add_empty_with_callback - thumb_func_start template_read -; int template_read(u8 obj_id, struct objtemplate *a2, s16 x, s16 y, u8 y_height_related) -template_read: ; 8006EFC + thumb_func_start AddObject +; u8 AddObject(u8 index, struct objtemplate *template, u16 x, u16 y, u8 subpriority) +AddObject: ; 8006EFC push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -741,7 +745,7 @@ template_read: ; 8006EFC ldr r1, =0x02020630 adds r7, r0, r1 adds r0, r7, 0 - bl obj_delete + bl RemoveObject adds r2, r7, 0 adds r2, 0x3E ldrb r0, [r2] @@ -786,7 +790,7 @@ template_read: ; 8006EFC lsls r3, 30 lsrs r3, 30 adds r0, r7, 0 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft mov r0, r8 ldrh r1, [r0] ldr r4, =0xffff0000 @@ -800,7 +804,7 @@ template_read: ; 8006EFC lsrs r0, 5 lsls r0, 24 lsrs r0, 24 - bl gpu_tile_obj_alloc + bl AllocObjectTiles lsls r0, 16 lsrs r2, r0, 16 asrs r0, 16 @@ -808,7 +812,7 @@ template_read: ; 8006EFC cmp r0, r1 bne @08006FC8 adds r0, r7, 0 - bl obj_delete + bl RemoveObject movs r0, 0x40 b @08007040 .pool @@ -837,7 +841,7 @@ template_read: ; 8006EFC @08006FF8: mov r1, r8 ldrh r0, [r1] - bl gpu_tile_obj_tag_get_range_start + bl GetObjectTileRangeStartByTag adds r1, r7, 0 adds r1, 0x40 strh r0, [r1] @@ -861,7 +865,7 @@ template_read: ; 8006EFC beq @0800703E mov r1, r8 ldrh r0, [r1, 0x2] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 4 ldrb r2, [r7, 0x5] movs r1, 0xF @@ -879,11 +883,11 @@ template_read: ; 8006EFC pop {r1} bx r1 .pool - thumb_func_end template_read + thumb_func_end AddObject - thumb_func_start obj_add_from_template_call_callback_once -; int obj_add_from_template_call_callback_once(struct objtemplate *template, s16 x, s16 y, u8 y_height_related) -obj_add_from_template_call_callback_once: ; 8007054 + thumb_func_start AddObjectAndAnimateForOneFrame +; u8 AddObjectAndAnimateForOneFrame(struct objtemplate *template, u16 x, u16 y, u8 subpriority) +AddObjectAndAnimateForOneFrame: ; 8007054 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -919,7 +923,7 @@ obj_add_from_template_call_callback_once: ; 8007054 asrs r2, r3, 16 mov r5, r8 asrs r3, r5, 16 - bl template_read + bl AddObject lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 @@ -935,7 +939,7 @@ obj_add_from_template_call_callback_once: ; 8007054 cmp r0, 0 beq @080070C0 adds r0, r4, 0 - bl obj_anim_step + bl AnimateObject @080070C0: adds r0, r5, 0 b @080070D8 @@ -957,11 +961,11 @@ obj_add_from_template_call_callback_once: ; 8007054 pop {r4-r7} pop {r1} bx r1 - thumb_func_end obj_add_from_template_call_callback_once + thumb_func_end AddObjectAndAnimateForOneFrame - thumb_func_start obj_delete_and_free_tiles -; void obj_delete_and_free_tiles(struct obj *obj) -obj_delete_and_free_tiles: ; 80070E8 + thumb_func_start RemoveObjectAndFreeTiles +; void RemoveObjectAndFreeTiles(struct obj *object) +RemoveObjectAndFreeTiles: ; 80070E8 push {r4-r7,lr} adds r5, r0, 0 adds r0, 0x3E @@ -1008,17 +1012,17 @@ obj_delete_and_free_tiles: ; 80070E8 bcc @08007122 @0800713E: adds r0, r5, 0 - bl obj_delete + bl RemoveObject @08007144: pop {r4-r7} pop {r0} bx r0 .pool - thumb_func_end obj_delete_and_free_tiles + thumb_func_end RemoveObjectAndFreeTiles - thumb_func_start reset_super_sprites -; void reset_super_sprites(u8 a1, u8 a2) -reset_super_sprites: ; 8007150 + thumb_func_start ResetSpriteRange +; void ResetSpriteRange(u8 startIndex, u8 endIndex) +ResetSpriteRange: ; 8007150 push {r4-r6,lr} lsls r0, 24 lsls r1, 24 @@ -1045,11 +1049,11 @@ reset_super_sprites: ; 8007150 pop {r0} bx r0 .pool - thumb_func_end reset_super_sprites + thumb_func_end ResetSpriteRange - thumb_func_start copy_super_sprites_to_oam -; void copy_super_sprites_to_oam() -copy_super_sprites_to_oam: ; 8007188 + thumb_func_start LoadOamFromSprites +; void LoadOamFromSprites() +LoadOamFromSprites: ; 8007188 push {lr} ldr r2, =0x030022c0 ldr r1, =0x00000439 @@ -1069,10 +1073,11 @@ copy_super_sprites_to_oam: ; 8007188 pop {r0} bx r0 .pool - thumb_func_end copy_super_sprites_to_oam + thumb_func_end LoadOamFromSprites - thumb_func_start copy_queue_clear -copy_queue_clear: ; 80071B8 + thumb_func_start ClearObjectCopyRequests +; void ClearObjectCopyRequests() +ClearObjectCopyRequests: ; 80071B8 push {r4,r5,lr} ldr r0, =0x02021834 movs r1, 0 @@ -1101,10 +1106,11 @@ copy_queue_clear: ; 80071B8 pop {r0} bx r0 .pool - thumb_func_end copy_queue_clear + thumb_func_end ClearObjectCopyRequests - thumb_func_start reset_rotscale_coeffs -reset_rotscale_coeffs: ; 80071F8 + thumb_func_start ResetSpriteTransformationMatrices +; void ResetSpriteTransformationMatrices() +ResetSpriteTransformationMatrices: ; 80071F8 push {r4,lr} movs r1, 0 ldr r4, =0x02021bc0 @@ -1127,10 +1133,11 @@ reset_rotscale_coeffs: ; 80071F8 pop {r0} bx r0 .pool - thumb_func_end reset_rotscale_coeffs + thumb_func_end ResetSpriteTransformationMatrices - thumb_func_start rotscale_set_direct -rotscale_set_direct: ; 8007224 + thumb_func_start SetSpriteTransformationMatrix +; void SetSpriteTransformationMatrix(u8 index, u16 a, u16 b, u16 c, u16 d) +SetSpriteTransformationMatrix: ; 8007224 push {r4,r5,lr} ldr r5, [sp, 0xC] lsls r0, 24 @@ -1145,11 +1152,11 @@ rotscale_set_direct: ; 8007224 pop {r0} bx r0 .pool - thumb_func_end rotscale_set_direct + thumb_func_end SetSpriteTransformationMatrix - thumb_func_start obj_delete -; void obj_delete(struct obj *obj) -obj_delete: ; 8007244 + thumb_func_start RemoveObject +; void RemoveObject(struct obj *object) +RemoveObject: ; 8007244 push {lr} ldr r1, =gUnknown_082EC64C movs r2, 0x44 @@ -1157,10 +1164,11 @@ obj_delete: ; 8007244 pop {r0} bx r0 .pool - thumb_func_end obj_delete + thumb_func_end RemoveObject - thumb_func_start oam_center -oam_center: ; 8007258 + thumb_func_start CalcVecFromObjectCenterToObjectUpperLeft +; void CalcVecFromObjectCenterToObjectUpperLeft(struct obj *object, u8 shape, u8 size, u8 affineMode) +CalcVecFromObjectCenterToObjectUpperLeft: ; 8007258 push {r4-r6,lr} adds r6, r0, 0 lsls r1, 24 @@ -1194,11 +1202,11 @@ oam_center: ; 8007258 pop {r0} bx r0 .pool - thumb_func_end oam_center + thumb_func_end CalcVecFromObjectCenterToObjectUpperLeft - thumb_func_start gpu_tile_obj_alloc -; int gpu_tile_obj_alloc(u16 tile_count) -gpu_tile_obj_alloc: ; 800729C + thumb_func_start AllocObjectTiles +; s16 AllocObjectTiles(u16 numTiles) +AllocObjectTiles: ; 800729C push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -1345,11 +1353,11 @@ gpu_tile_obj_alloc: ; 800729C pop {r1} bx r1 .pool - thumb_func_end gpu_tile_obj_alloc + thumb_func_end AllocObjectTiles - thumb_func_start gpu_tile_obj_alloc_map_bit_op -; unsigned int gpu_tile_obj_alloc_map_bit_op(int tile_id, bit_operation operation) -gpu_tile_obj_alloc_map_bit_op: ; 80073B8 + thumb_func_start Unused_ObjectTileAllocationBitArrayOp +; unsigned int Unused_ObjectTileAllocationBitArrayOp(u16 tileNum, u8 op) +Unused_ObjectTileAllocationBitArrayOp: ; 80073B8 push {r4-r6,lr} lsls r0, 16 lsrs r2, r0, 16 @@ -1405,16 +1413,17 @@ gpu_tile_obj_alloc_map_bit_op: ; 80073B8 pop {r1} bx r1 .pool - thumb_func_end gpu_tile_obj_alloc_map_bit_op + thumb_func_end Unused_ObjectTileAllocationBitArrayOp thumb_func_start DummyObjectCallback +; void DummyObjectCallback(struct obj *object) DummyObjectCallback: ; 8007428 bx lr thumb_func_end DummyObjectCallback - thumb_func_start copy_queue_process -; void copy_queue_process() -copy_queue_process: ; 800742C + thumb_func_start ProcessObjectCopyRequests +; void ProcessObjectCopyRequests() +ProcessObjectCopyRequests: ; 800742C push {r4-r7,lr} ldr r0, =0x02021834 ldrb r0, [r0] @@ -1457,11 +1466,11 @@ copy_queue_process: ; 800742C pop {r0} bx r0 .pool - thumb_func_end copy_queue_process + thumb_func_end ProcessObjectCopyRequests - thumb_func_start copy_queue_add_oam_frame -; void copy_queue_add_oam_frame(u16 frameIndex, u16 targetTileNum, struct obj_tiles *frames) -copy_queue_add_oam_frame: ; 8007488 + thumb_func_start AddPicToObjectCopyRequests +; void AddPicToObjectCopyRequests(u16 picIndex, u16 targetTileNum, struct obj_tiles *pics) +AddPicToObjectCopyRequests: ; 8007488 push {r4-r6,lr} adds r5, r2, 0 lsls r0, 16 @@ -1507,11 +1516,11 @@ copy_queue_add_oam_frame: ; 8007488 pop {r0} bx r0 .pool - thumb_func_end copy_queue_add_oam_frame + thumb_func_end AddPicToObjectCopyRequests - thumb_func_start copy_queue_add -; void copy_queue_add(void *src, void *dest, u16 len) -copy_queue_add: ; 80074EC + thumb_func_start AddTilesToObjectCopyRequests +; void AddTilesToObjectCopyRequests(void *src, void *dest, u16 size) +AddTilesToObjectCopyRequests: ; 80074EC push {r4-r6,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -1549,11 +1558,11 @@ copy_queue_add: ; 80074EC pop {r0} bx r0 .pool - thumb_func_end copy_queue_add + thumb_func_end AddTilesToObjectCopyRequests - thumb_func_start copy_all_from_objects -; void copy_all_from_objects(void *dest) -copy_all_from_objects: ; 800753C + thumb_func_start Unused_CopyFromObjects +; void Unused_CopyFromObjects(void *dest) +Unused_CopyFromObjects: ; 800753C push {r4,lr} adds r1, r0, 0 ldr r3, =0x02020630 @@ -1571,11 +1580,11 @@ copy_all_from_objects: ; 800753C pop {r0} bx r0 .pool - thumb_func_end copy_all_from_objects + thumb_func_end Unused_CopyFromObjects - thumb_func_start copy_all_to_objects -; void copy_all_to_objects(void *src) -copy_all_to_objects: ; 8007564 + thumb_func_start Unused_CopyToObjects +; void Unused_CopyToObjects(void *src) +Unused_CopyToObjects: ; 8007564 push {r4,lr} adds r1, r0, 0 ldr r3, =0x02020630 @@ -1593,11 +1602,11 @@ copy_all_to_objects: ; 8007564 pop {r0} bx r0 .pool - thumb_func_end copy_all_to_objects + thumb_func_end Unused_CopyToObjects - thumb_func_start obj_delete_all -; void obj_delete_all() -obj_delete_all: ; 800758C + thumb_func_start RemoveAllObjects +; void RemoveAllObjects() +RemoveAllObjects: ; 800758C push {r4,r5,lr} movs r4, 0 @08007590: @@ -1606,7 +1615,7 @@ obj_delete_all: ; 800758C lsls r0, 2 ldr r5, =0x02020630 adds r0, r5 - bl obj_delete + bl RemoveObject ldr r0, =0x020217f4 adds r0, r4, r0 strb r4, [r0] @@ -1619,16 +1628,16 @@ obj_delete_all: ; 800758C adds r0, r4 lsls r0, 2 adds r0, r5 - bl obj_delete + bl RemoveObject pop {r4,r5} pop {r0} bx r0 .pool - thumb_func_end obj_delete_all + thumb_func_end RemoveAllObjects - thumb_func_start obj_free_tiles -; void obj_free_tiles(struct obj *obj) -obj_free_tiles: ; 80075C8 + thumb_func_start FreeObjectTiles +; void FreeObjectTiles(struct obj *object) +FreeObjectTiles: ; 80075C8 push {lr} ldr r2, [r0, 0x14] ldrh r1, [r2] @@ -1636,23 +1645,23 @@ obj_free_tiles: ; 80075C8 cmp r1, r0 beq @080075DA adds r0, r1, 0 - bl gpu_tile_obj_free_by_tag + bl FreeObjectTilesByTag @080075DA: pop {r0} bx r0 .pool - thumb_func_end obj_free_tiles + thumb_func_end FreeObjectTiles - thumb_func_start obj_free_pal -; void obj_free_pal(struct obj *obj) -obj_free_pal: ; 80075E4 + thumb_func_start FreeObjectPalette +; void FreeObjectPalette(struct obj *object) +FreeObjectPalette: ; 80075E4 push {lr} ldr r0, [r0, 0x14] ldrh r0, [r0, 0x2] - bl gpu_pal_free_tag + bl FreeObjectPaletteByTag pop {r0} bx r0 - thumb_func_end obj_free_pal + thumb_func_end FreeObjectPalette thumb_func_start obj_free_rotscale_entry ; void obj_free_rotscale_entry(struct obj *obj) @@ -1681,26 +1690,26 @@ obj_free_rotscale_entry: ; 80075F4 bx r0 thumb_func_end obj_free_rotscale_entry - thumb_func_start obj_delete_and_free_resources -; void obj_delete_and_free_resources(struct obj *obj) -obj_delete_and_free_resources: ; 8007620 + thumb_func_start RemoveObjectAndFreeResources +; void RemoveObjectAndFreeResources(struct obj *object) +RemoveObjectAndFreeResources: ; 8007620 push {r4,lr} adds r4, r0, 0 - bl obj_free_tiles + bl FreeObjectTiles adds r0, r4, 0 - bl obj_free_pal + bl FreeObjectPalette adds r0, r4, 0 bl obj_free_rotscale_entry adds r0, r4, 0 - bl obj_delete_and_free_tiles + bl RemoveObjectAndFreeTiles pop {r4} pop {r0} bx r0 - thumb_func_end obj_delete_and_free_resources + thumb_func_end RemoveObjectAndFreeResources - thumb_func_start obj_anim_step -; void obj_anim_step(struct obj *obj) -obj_anim_step: ; 8007640 + thumb_func_start AnimateObject +; void AnimateObject(struct obj *object) +AnimateObject: ; 8007640 push {r4,r5,lr} adds r4, r0, 0 ldr r2, =gUnknown_082EC6C4 @@ -1731,11 +1740,11 @@ obj_anim_step: ; 8007640 pop {r0} bx r0 .pool - thumb_func_end obj_anim_step + thumb_func_end AnimateObject - thumb_func_start obj_anim_image_begin -; void obj_anim_image_begin(struct obj *obj) -obj_anim_image_begin: ; 8007688 + thumb_func_start BeginObjectImageAnim +; void BeginObjectImageAnim(struct obj *object) +BeginObjectImageAnim: ; 8007688 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -1846,7 +1855,7 @@ obj_anim_image_begin: ; 8007688 lsls r1, 22 lsrs r1, 22 ldr r2, [r4, 0xC] - bl copy_queue_add_oam_frame + bl AddPicToObjectCopyRequests @0800776C: pop {r3,r4} mov r8, r3 @@ -1854,11 +1863,11 @@ obj_anim_image_begin: ; 8007688 pop {r4-r7} pop {r0} bx r0 - thumb_func_end obj_anim_image_begin + thumb_func_end BeginObjectImageAnim - thumb_func_start obj_anim_image_continue -; void obj_anim_image_continue(struct obj *obj) -obj_anim_image_continue: ; 8007778 + thumb_func_start ContinueObjectImageAnim +; void ContinueObjectImageAnim(struct obj *object) +ContinueObjectImageAnim: ; 8007778 push {r4,lr} adds r4, r0, 0 adds r0, 0x2C @@ -1938,11 +1947,11 @@ obj_anim_image_continue: ; 8007778 pop {r0} bx r0 .pool - thumb_func_end obj_anim_image_continue + thumb_func_end ContinueObjectImageAnim - thumb_func_start anim_image_3 -; void anim_image_3(struct obj *obj) -anim_image_3: ; 8007818 + thumb_func_start ImageAnimCmd_frame +; void ImageAnimCmd_frame(struct obj *object) +ImageAnimCmd_frame: ; 8007818 push {r4-r7,lr} mov r7, r8 push {r7} @@ -2021,18 +2030,18 @@ anim_image_3: ; 8007818 lsls r1, 22 lsrs r1, 22 ldr r2, [r4, 0xC] - bl copy_queue_add_oam_frame + bl AddPicToObjectCopyRequests @080078BA: pop {r3} mov r8, r3 pop {r4-r7} pop {r0} bx r0 - thumb_func_end anim_image_3 + thumb_func_end ImageAnimCmd_frame - thumb_func_start anim_image_2 -; void anim_image_2(struct obj *obj) -anim_image_2: ; 80078C4 + thumb_func_start ImageAnimCmd_end +; void ImageAnimCmd_end(struct obj *object) +ImageAnimCmd_end: ; 80078C4 adds r2, r0, 0 adds r2, 0x2B ldrb r1, [r2] @@ -2044,11 +2053,11 @@ anim_image_2: ; 80078C4 orrs r1, r2 strb r1, [r0] bx lr - thumb_func_end anim_image_2 + thumb_func_end ImageAnimCmd_end - thumb_func_start anim_image_1 -; void anim_image_1(struct obj *obj) -anim_image_1: ; 80078DC + thumb_func_start ImageAnimCmd_jump +; void ImageAnimCmd_jump(struct obj *object) +ImageAnimCmd_jump: ; 80078DC push {r4-r7,lr} mov r7, r8 push {r7} @@ -2140,18 +2149,18 @@ anim_image_1: ; 80078DC lsls r1, 22 lsrs r1, 22 ldr r2, [r4, 0xC] - bl copy_queue_add_oam_frame + bl AddPicToObjectCopyRequests @0800799A: pop {r3} mov r8, r3 pop {r4-r7} pop {r0} bx r0 - thumb_func_end anim_image_1 + thumb_func_end ImageAnimCmd_jump - thumb_func_start anim_image_0 -; void anim_image_0(struct obj *obj) -anim_image_0: ; 80079A4 + thumb_func_start ImageAnimCmd_loop +; void ImageAnimCmd_loop(struct obj *object) +ImageAnimCmd_loop: ; 80079A4 push {lr} adds r1, r0, 0 adds r0, 0x2D @@ -2159,19 +2168,19 @@ anim_image_0: ; 80079A4 cmp r0, 0 beq @080079B8 adds r0, r1, 0 - bl sub_80079FC + bl ContinueImageAnimLoop b @080079BE @080079B8: adds r0, r1, 0 - bl sub_80079C4 + bl BeginImageAnimLoop @080079BE: pop {r0} bx r0 - thumb_func_end anim_image_0 + thumb_func_end ImageAnimCmd_loop - thumb_func_start sub_80079C4 -; void sub_80079C4(struct obj *obj) -sub_80079C4: ; 80079C4 + thumb_func_start BeginImageAnimLoop +; void BeginImageAnimLoop(struct obj *object) +BeginImageAnimLoop: ; 80079C4 push {r4,lr} adds r4, r0, 0 adds r0, 0x2A @@ -2192,17 +2201,17 @@ sub_80079C4: ; 80079C4 adds r1, 0x2D strb r0, [r1] adds r0, r4, 0 - bl obj_anim_rewind_to_cmd00 + bl JumpToTopOfImageAnimLoop adds r0, r4, 0 - bl obj_anim_image_continue + bl ContinueObjectImageAnim pop {r4} pop {r0} bx r0 - thumb_func_end sub_80079C4 + thumb_func_end BeginImageAnimLoop - thumb_func_start sub_80079FC -; void sub_80079FC(struct obj *obj) -sub_80079FC: ; 80079FC + thumb_func_start ContinueImageAnimLoop +; void ContinueImageAnimLoop(struct obj *object) +ContinueImageAnimLoop: ; 80079FC push {r4,lr} adds r4, r0, 0 adds r1, r4, 0 @@ -2211,17 +2220,17 @@ sub_80079FC: ; 80079FC subs r0, 0x1 strb r0, [r1] adds r0, r4, 0 - bl obj_anim_rewind_to_cmd00 + bl JumpToTopOfImageAnimLoop adds r0, r4, 0 - bl obj_anim_image_continue + bl ContinueObjectImageAnim pop {r4} pop {r0} bx r0 - thumb_func_end sub_80079FC + thumb_func_end ContinueImageAnimLoop - thumb_func_start obj_anim_rewind_to_cmd00 -; void obj_anim_rewind_to_cmd00(struct obj *obj) -obj_anim_rewind_to_cmd00: ; 8007A1C + thumb_func_start JumpToTopOfImageAnimLoop +; void JumpToTopOfImageAnimLoop(struct obj *object) +JumpToTopOfImageAnimLoop: ; 8007A1C push {r4-r7,lr} mov r12, r0 adds r0, 0x2D @@ -2282,11 +2291,11 @@ obj_anim_rewind_to_cmd00: ; 8007A1C pop {r4-r7} pop {r0} bx r0 - thumb_func_end obj_anim_rewind_to_cmd00 + thumb_func_end JumpToTopOfImageAnimLoop - thumb_func_start obj_anim_rotscale_begin -; void obj_anim_rotscale_begin(struct obj *obj) -obj_anim_rotscale_begin: ; 8007A90 + thumb_func_start BeginObjectRotScalAnim +; void BeginObjectRotScalAnim(struct obj *object) +BeginObjectRotScalAnim: ; 8007A90 push {r4-r7,lr} sub sp, 0x8 adds r6, r0, 0 @@ -2353,11 +2362,11 @@ obj_anim_rotscale_begin: ; 8007A90 pop {r0} bx r0 .pool - thumb_func_end obj_anim_rotscale_begin + thumb_func_end BeginObjectRotScalAnim - thumb_func_start obj_anim_rotscale_continue -; void obj_anim_rotscale_continue(struct obj *obj) -obj_anim_rotscale_continue: ; 8007B24 + thumb_func_start ContinueObjectRotScalAnim +; void ContinueObjectRotScalAnim(struct obj *object) +ContinueObjectRotScalAnim: ; 8007B24 push {r4,r5,lr} adds r4, r0, 0 ldrb r0, [r4, 0x1] @@ -2442,9 +2451,10 @@ obj_anim_rotscale_continue: ; 8007B24 pop {r0} bx r0 .pool - thumb_func_end obj_anim_rotscale_continue + thumb_func_end ContinueObjectRotScalAnim thumb_func_start sub_8007BD8 +; void sub_8007BD8(u8 index, struct obj *object) sub_8007BD8: ; 8007BD8 push {r4,r5,lr} sub sp, 0x8 @@ -2471,9 +2481,9 @@ sub_8007BD8: ; 8007BD8 bx r0 thumb_func_end sub_8007BD8 - thumb_func_start anim_rotscale_0 -; void anim_rotscale_0(u8 index, struct obj *obj) -anim_rotscale_0: ; 8007C0C + thumb_func_start RotScalAnimCmd_loop +; void RotScalAnimCmd_loop(u8 index, struct obj *object) +RotScalAnimCmd_loop: ; 8007C0C push {lr} adds r3, r1, 0 lsls r0, 24 @@ -2488,20 +2498,21 @@ anim_rotscale_0: ; 8007C0C beq @08007C34 adds r0, r2, 0 adds r1, r3, 0 - bl sub_8007C7C + bl ContinueRotScalAnimLoop b @08007C3C .pool @08007C34: adds r0, r2, 0 adds r1, r3, 0 - bl sub_8007C40 + bl BeginRotScalAnimLoop @08007C3C: pop {r0} bx r0 - thumb_func_end anim_rotscale_0 + thumb_func_end RotScalAnimCmd_loop - thumb_func_start sub_8007C40 -sub_8007C40: ; 8007C40 + thumb_func_start BeginRotScalAnimLoop +; void BeginRotScalAnimLoop(u8 index, struct obj *object) +BeginRotScalAnimLoop: ; 8007C40 push {r4,lr} adds r4, r1, 0 lsls r0, 24 @@ -2522,17 +2533,18 @@ sub_8007C40: ; 8007C40 ldrh r1, [r1, 0x2] strb r1, [r3, 0x3] adds r1, r4, 0 - bl obj_anim_rotscale_rewind_to_cmd00_maybe + bl JumpToTopOfRotScalAnimLoop adds r0, r4, 0 - bl obj_anim_rotscale_continue + bl ContinueObjectRotScalAnim pop {r4} pop {r0} bx r0 .pool - thumb_func_end sub_8007C40 + thumb_func_end BeginRotScalAnimLoop - thumb_func_start sub_8007C7C -sub_8007C7C: ; 8007C7C + thumb_func_start ContinueRotScalAnimLoop +; void ContinueRotScalAnimLoop(u8 index, struct obj *object) +ContinueRotScalAnimLoop: ; 8007C7C push {r4,lr} adds r4, r1, 0 lsls r0, 24 @@ -2546,17 +2558,18 @@ sub_8007C7C: ; 8007C7C subs r2, 0x1 strb r2, [r1, 0x3] adds r1, r4, 0 - bl obj_anim_rotscale_rewind_to_cmd00_maybe + bl JumpToTopOfRotScalAnimLoop adds r0, r4, 0 - bl obj_anim_rotscale_continue + bl ContinueObjectRotScalAnim pop {r4} pop {r0} bx r0 .pool - thumb_func_end sub_8007C7C + thumb_func_end ContinueRotScalAnimLoop - thumb_func_start obj_anim_rotscale_rewind_to_cmd00_maybe -obj_anim_rotscale_rewind_to_cmd00_maybe: ; 8007CAC + thumb_func_start JumpToTopOfRotScalAnimLoop +; void JumpToTopOfRotScalAnimLoop(u8 index, struct obj *object) +JumpToTopOfRotScalAnimLoop: ; 8007CAC push {r4-r7,lr} mov r12, r1 lsls r0, 24 @@ -2612,11 +2625,11 @@ obj_anim_rotscale_rewind_to_cmd00_maybe: ; 8007CAC pop {r0} bx r0 .pool - thumb_func_end obj_anim_rotscale_rewind_to_cmd00_maybe + thumb_func_end JumpToTopOfRotScalAnimLoop - thumb_func_start anim_rotscale_1 -; void anim_rotscale_1(u8 index, struct obj *obj) -anim_rotscale_1: ; 8007D18 + thumb_func_start RotScalAnimCmd_jump +; void RotScalAnimCmd_jump(u8 index, struct obj *object) +RotScalAnimCmd_jump: ; 8007D18 push {r4-r6,lr} sub sp, 0x8 adds r5, r0, 0 @@ -2651,11 +2664,11 @@ anim_rotscale_1: ; 8007D18 pop {r0} bx r0 .pool - thumb_func_end anim_rotscale_1 + thumb_func_end RotScalAnimCmd_jump - thumb_func_start anim_rotscale_2 -; void anim_rotscale_2(u8 index, struct obj *obj) -anim_rotscale_2: ; 8007D64 + thumb_func_start RotScalAnimCmd_end +; void RotScalAnimCmd_end(u8 index, struct obj *object) +RotScalAnimCmd_end: ; 8007D64 push {lr} sub sp, 0x8 lsls r0, 24 @@ -2683,11 +2696,11 @@ anim_rotscale_2: ; 8007D64 pop {r0} bx r0 .pool - thumb_func_end anim_rotscale_2 + thumb_func_end RotScalAnimCmd_end - thumb_func_start anim_rotscale_3 -; void anim_rotscale_3(u8 index, struct obj *obj) -anim_rotscale_3: ; 8007DA0 + thumb_func_start RotScalAnimCmd_frame +; void RotScalAnimCmd_frame(u8 index, struct obj *object) +RotScalAnimCmd_frame: ; 8007DA0 push {r4,r5,lr} sub sp, 0x8 adds r4, r0, 0 @@ -2712,7 +2725,7 @@ anim_rotscale_3: ; 8007DA0 pop {r0} bx r0 .pool - thumb_func_end anim_rotscale_3 + thumb_func_end RotScalAnimCmd_frame thumb_func_start rotscale_set_indirect ; void rotscale_set_indirect(u8 rotscale_entry_index, s16 rotscale_data[]) @@ -2953,7 +2966,7 @@ rotscale_reset_half: ; 8007F64 thumb_func_end rotscale_reset_half thumb_func_start rotscale_reset_full_1 -; void rotscale_reset_full_1(u8 index) +; void rotscale_reset_full_1(u8 index, u8 a2) rotscale_reset_full_1: ; 8007F80 lsls r0, 24 lsrs r0, 24 @@ -3047,6 +3060,7 @@ obj_anim_image_delay_progress: ; 8007FF4 thumb_func_end obj_anim_image_delay_progress thumb_func_start obj_anim_rotscale_delay_progress +; u8 obj_anim_rotscale_delay_progress(struct obj *object, u8 index) obj_anim_rotscale_delay_progress: ; 800801C push {lr} lsls r1, 24 @@ -3250,9 +3264,9 @@ sub_8008168: ; 8008168 bx r0 thumb_func_end sub_8008168 - thumb_func_start obj_anim_image_start -; void obj_anim_image_start(struct obj *object, u8 a2) -obj_anim_image_start: ; 80081A8 + thumb_func_start StartObjectImageAnim +; void StartObjectImageAnim(struct obj *object, u8 whichAnim) +StartObjectImageAnim: ; 80081A8 adds r2, r0, 0 adds r2, 0x2A strb r1, [r2] @@ -3265,10 +3279,11 @@ obj_anim_image_start: ; 80081A8 ands r1, r2 strb r1, [r0] bx lr - thumb_func_end obj_anim_image_start + thumb_func_end StartObjectImageAnim - thumb_func_start obj_anim_image_start_if_different -obj_anim_image_start_if_different: ; 80081C0 + thumb_func_start StartObjectImageAnimIfDifferent +; void StartObjectImageAnimIfDifferent(struct obj *object, u8 whichAnim) +StartObjectImageAnimIfDifferent: ; 80081C0 push {lr} adds r2, r0, 0 lsls r1, 24 @@ -3278,14 +3293,15 @@ obj_anim_image_start_if_different: ; 80081C0 cmp r0, r1 beq @080081D6 adds r0, r2, 0 - bl obj_anim_image_start + bl StartObjectImageAnim @080081D6: pop {r0} bx r0 - thumb_func_end obj_anim_image_start_if_different + thumb_func_end StartObjectImageAnimIfDifferent - thumb_func_start obj_anim_image_seek -obj_anim_image_seek: ; 80081DC + thumb_func_start SeekObjectImageAnim +; void SeekObjectImageAnim(struct obj *object, u8 cmdIndex) +SeekObjectImageAnim: ; 80081DC push {r4-r7,lr} adds r3, r0, 0 lsls r1, 24 @@ -3322,7 +3338,7 @@ obj_anim_image_seek: ; 80081DC ands r0, r1 strb r0, [r4] adds r0, r3, 0 - bl obj_anim_image_continue + bl ContinueObjectImageAnim ldrb r2, [r4] movs r0, 0x3F ands r0, r2 @@ -3347,9 +3363,10 @@ obj_anim_image_seek: ; 80081DC pop {r4-r7} pop {r0} bx r0 - thumb_func_end obj_anim_image_seek + thumb_func_end SeekObjectImageAnim thumb_func_start sub_8008258 +; void sub_8008258(u8 index, u8 a2) sub_8008258: ; 8008258 push {r4,r5,lr} adds r5, r0, 0 @@ -3374,6 +3391,7 @@ sub_8008258: ; 8008258 thumb_func_end sub_8008258 thumb_func_start sub_8008284 +; void sub_8008284(u8 index, u8 a2) sub_8008284: ; 8008284 push {r4,r5,lr} adds r5, r0, 0 @@ -3513,7 +3531,7 @@ rotscale_reset_all: ; 800837C ldr r1, =0x03003018 movs r0, 0 str r0, [r1] - bl reset_rotscale_coeffs + bl ResetSpriteTransformationMatrices movs r4, 0 @08008390: adds r0, r4, 0 @@ -3592,7 +3610,7 @@ rotscale_free_entry: ; 80083E8 adds r0, r2, 0 movs r2, 0 movs r3, 0 - bl rotscale_set_direct + bl SetSpriteTransformationMatrix add sp, 0x4 pop {r0} bx r0 @@ -3616,7 +3634,7 @@ obj_alloc_rotscale_entry: ; 8008428 lsls r3, 30 lsrs r3, 30 adds r0, r4, 0 - bl oam_center + bl CalcVecFromObjectCenterToObjectUpperLeft movs r0, 0x1F adds r1, r5, 0 ands r1, r0 @@ -3702,14 +3720,14 @@ sub_8008478: ; 8008478 .pool thumb_func_end sub_8008478 - thumb_func_start gpu_tile_obj_alloc_tag_and_copy_to_vram -; int gpu_tile_obj_alloc_tag_and_copy_to_vram(struct obj_tiles *x) -gpu_tile_obj_alloc_tag_and_copy_to_vram: ; 80084F8 + thumb_func_start LoadObjectPic +; u16 LoadObjectPic(struct obj_tiles *pic) +LoadObjectPic: ; 80084F8 push {r4-r6,lr} adds r5, r0, 0 ldrh r0, [r5, 0x4] lsrs r0, 5 - bl gpu_tile_obj_alloc + bl AllocObjectTiles lsls r4, r0, 16 asrs r6, r4, 16 cmp r6, 0 @@ -3719,7 +3737,7 @@ gpu_tile_obj_alloc_tag_and_copy_to_vram: ; 80084F8 ldrh r2, [r5, 0x4] lsrs r2, 5 adds r1, r4, 0 - bl gpu_tile_obj_tag_add + bl AddObjectTileRange ldr r0, [r5] lsls r1, r6, 5 ldr r2, =0x06010000 @@ -3736,11 +3754,11 @@ gpu_tile_obj_alloc_tag_and_copy_to_vram: ; 80084F8 pop {r4-r6} pop {r1} bx r1 - thumb_func_end gpu_tile_obj_alloc_tag_and_copy_to_vram + thumb_func_end LoadObjectPic - thumb_func_start gpu_tile_obj_alloc_and_load_multiple -; void gpu_tile_obj_alloc_and_load_multiple(struct obj_tiles[]) -gpu_tile_obj_alloc_and_load_multiple: ; 800853C + thumb_func_start LoadObjectPics +; void LoadObjectPics(struct obj_tiles *pics) +LoadObjectPics: ; 800853C push {r4,r5,lr} adds r5, r0, 0 movs r4, 0 @@ -3750,7 +3768,7 @@ gpu_tile_obj_alloc_and_load_multiple: ; 800853C @08008548: lsls r0, r4, 3 adds r0, r5, r0 - bl gpu_tile_obj_alloc_tag_and_copy_to_vram + bl LoadObjectPic adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -3763,17 +3781,17 @@ gpu_tile_obj_alloc_and_load_multiple: ; 800853C pop {r4,r5} pop {r0} bx r0 - thumb_func_end gpu_tile_obj_alloc_and_load_multiple + thumb_func_end LoadObjectPics - thumb_func_start gpu_tile_obj_free_by_tag -; void gpu_tile_obj_free_by_tag(int tag) -gpu_tile_obj_free_by_tag: ; 8008568 + thumb_func_start FreeObjectTilesByTag +; void FreeObjectTilesByTag(u16 tag) +FreeObjectTilesByTag: ; 8008568 push {r4-r7,lr} mov r7, r8 push {r7} lsls r0, 16 lsrs r0, 16 - bl gpu_tile_obj_tag_index_of + bl IndexOfObjectTilesTag lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xFF @@ -3823,11 +3841,11 @@ gpu_tile_obj_free_by_tag: ; 8008568 pop {r0} bx r0 .pool - thumb_func_end gpu_tile_obj_free_by_tag + thumb_func_end FreeObjectTilesByTag - thumb_func_start gpu_tile_obj_tags_reset -; void gpu_tile_obj_tags_reset() -gpu_tile_obj_tags_reset: ; 80085E0 + thumb_func_start FreeAllObjectTiles +; void FreeAllObjectTiles() +FreeAllObjectTiles: ; 80085E0 push {r4-r7,lr} movs r2, 0 ldr r7, =0x030009f0 @@ -3856,15 +3874,15 @@ gpu_tile_obj_tags_reset: ; 80085E0 pop {r0} bx r0 .pool - thumb_func_end gpu_tile_obj_tags_reset + thumb_func_end FreeAllObjectTiles - thumb_func_start gpu_tile_obj_tag_get_range_start -; int gpu_tile_obj_tag_get_range_start(int tag) -gpu_tile_obj_tag_get_range_start: ; 8008620 + thumb_func_start GetObjectTileRangeStartByTag +; u16 GetObjectTileRangeStartByTag(u16 tag) +GetObjectTileRangeStartByTag: ; 8008620 push {lr} lsls r0, 16 lsrs r0, 16 - bl gpu_tile_obj_tag_index_of + bl IndexOfObjectTilesTag lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xFF @@ -3881,10 +3899,11 @@ gpu_tile_obj_tag_get_range_start: ; 8008620 pop {r1} bx r1 .pool - thumb_func_end gpu_tile_obj_tag_get_range_start + thumb_func_end GetObjectTileRangeStartByTag - thumb_func_start gpu_tile_obj_tag_index_of -gpu_tile_obj_tag_index_of: ; 800864C + thumb_func_start IndexOfObjectTilesTag +; u8 IndexOfObjectTilesTag(u16 tag) +IndexOfObjectTilesTag: ; 800864C push {lr} lsls r0, 16 lsrs r2, r0, 16 @@ -3909,10 +3928,11 @@ gpu_tile_obj_tag_index_of: ; 800864C @08008674: pop {r1} bx r1 - thumb_func_end gpu_tile_obj_tag_index_of + thumb_func_end IndexOfObjectTilesTag - thumb_func_start gpu_tile_obj_tag_get_by_range_start -gpu_tile_obj_tag_get_by_range_start: ; 8008678 + thumb_func_start GetTagByObjectTileRangeStart +; u16 GetTagByObjectTileRangeStart(u16 rangeStart) +GetTagByObjectTileRangeStart: ; 8008678 push {r4-r6,lr} lsls r0, 16 lsrs r3, r0, 16 @@ -3946,11 +3966,11 @@ gpu_tile_obj_tag_get_by_range_start: ; 8008678 pop {r1} bx r1 .pool - thumb_func_end gpu_tile_obj_tag_get_by_range_start + thumb_func_end GetTagByObjectTileRangeStart - thumb_func_start gpu_tile_obj_tag_add -; void gpu_tile_obj_tag_add(u16 tag, u16 start, u16 count) -gpu_tile_obj_tag_add: ; 80086C4 + thumb_func_start AddObjectTileRange +; void AddObjectTileRange(u16 tag, u16 start, u16 count) +AddObjectTileRange: ; 80086C4 push {r4-r6,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -3962,7 +3982,7 @@ gpu_tile_obj_tag_add: ; 80086C4 lsls r6, 16 lsrs r6, 16 ldr r0, =0x0000ffff - bl gpu_tile_obj_tag_index_of + bl IndexOfObjectTilesTag lsls r0, 24 lsrs r0, 24 ldr r2, =0x030009f0 @@ -3980,10 +4000,11 @@ gpu_tile_obj_tag_add: ; 80086C4 pop {r0} bx r0 .pool - thumb_func_end gpu_tile_obj_tag_add + thumb_func_end AddObjectTileRange - thumb_func_start gpu_pal_allocator_reset -gpu_pal_allocator_reset: ; 800870C + thumb_func_start ResetObjectPaletteAllocator +; void ResetObjectPaletteAllocator() +ResetObjectPaletteAllocator: ; 800870C push {r4,lr} ldr r1, =0x0300301c movs r0, 0 @@ -4007,15 +4028,15 @@ gpu_pal_allocator_reset: ; 800870C pop {r0} bx r0 .pool - thumb_func_end gpu_pal_allocator_reset + thumb_func_end ResetObjectPaletteAllocator - thumb_func_start gpu_pal_obj_alloc_tag_and_apply -; s8 gpu_pal_obj_alloc_tag_and_apply(struct rom_obj_pal_data *data) -gpu_pal_obj_alloc_tag_and_apply: ; 8008744 + thumb_func_start LoadTaggedObjectPalette +; u8 LoadTaggedObjectPalette(struct ObjectPaletteInfo *palette) +LoadTaggedObjectPalette: ; 8008744 push {r4,r5,lr} adds r5, r0, 0 ldrh r0, [r5, 0x4] - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xFF @@ -4024,7 +4045,7 @@ gpu_pal_obj_alloc_tag_and_apply: ; 8008744 b @0800878A @0800875A: ldr r0, =0x0000ffff - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xFF @@ -4036,7 +4057,7 @@ gpu_pal_obj_alloc_tag_and_apply: ; 8008744 strh r1, [r0] ldr r0, [r5] lsls r1, r4, 4 - bl gpu_pal_obj_load + bl LoadObjectPalette adds r0, r4, 0 b @0800878A .pool @@ -4046,10 +4067,11 @@ gpu_pal_obj_alloc_tag_and_apply: ; 8008744 pop {r4,r5} pop {r1} bx r1 - thumb_func_end gpu_pal_obj_alloc_tag_and_apply + thumb_func_end LoadTaggedObjectPalette - thumb_func_start gpu_pal_obj_alloc_and_load_multiple -gpu_pal_obj_alloc_and_load_multiple: ; 8008790 + thumb_func_start LoadTaggedObjectPalettes +; void LoadTaggedObjectPalettes(struct ObjectPaletteInfo *palettes) +LoadTaggedObjectPalettes: ; 8008790 push {r4,r5,lr} adds r5, r0, 0 movs r4, 0 @@ -4065,7 +4087,7 @@ gpu_pal_obj_alloc_and_load_multiple: ; 8008790 cmp r0, 0 beq @080087B6 adds r0, r1, 0 - bl gpu_pal_obj_alloc_tag_and_apply + bl LoadTaggedObjectPalette lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF @@ -4074,11 +4096,11 @@ gpu_pal_obj_alloc_and_load_multiple: ; 8008790 pop {r4,r5} pop {r0} bx r0 - thumb_func_end gpu_pal_obj_alloc_and_load_multiple + thumb_func_end LoadTaggedObjectPalettes - thumb_func_start gpu_pal_obj_load -; void gpu_pal_obj_load(palette *pal, u16 offset) -gpu_pal_obj_load: ; 80087BC + thumb_func_start LoadObjectPalette +; void LoadObjectPalette(void *src, u16 destOffset) +LoadObjectPalette: ; 80087BC push {lr} lsls r1, 16 movs r2, 0x80 @@ -4089,16 +4111,16 @@ gpu_pal_obj_load: ; 80087BC bl gpu_pal_apply pop {r0} bx r0 - thumb_func_end gpu_pal_obj_load + thumb_func_end LoadObjectPalette - thumb_func_start gpu_pal_alloc_new -; int gpu_pal_alloc_new(u16 tag) -gpu_pal_alloc_new: ; 80087D4 + thumb_func_start AllocObjectPalette +; u8 AllocObjectPalette(u16 tag) +AllocObjectPalette: ; 80087D4 push {r4,lr} lsls r0, 16 lsrs r4, r0, 16 ldr r0, =0x0000ffff - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF @@ -4116,11 +4138,11 @@ gpu_pal_alloc_new: ; 80087D4 pop {r4} pop {r1} bx r1 - thumb_func_end gpu_pal_alloc_new + thumb_func_end AllocObjectPalette - thumb_func_start gpu_pal_tags_index_of -; int gpu_pal_tags_index_of(u16 a1) -gpu_pal_tags_index_of: ; 8008804 + thumb_func_start IndexOfObjectPaletteTag +; u8 IndexOfObjectPaletteTag(u16 tag) +IndexOfObjectPaletteTag: ; 8008804 push {lr} lsls r0, 16 lsrs r2, r0, 16 @@ -4149,10 +4171,11 @@ gpu_pal_tags_index_of: ; 8008804 @08008838: pop {r1} bx r1 - thumb_func_end gpu_pal_tags_index_of + thumb_func_end IndexOfObjectPaletteTag - thumb_func_start gpu_pal_tag_by_index -gpu_pal_tag_by_index: ; 800883C + thumb_func_start GetObjectPaletteTagBySlot +; u16 GetObjectPaletteTagBySlot(u8 paletteSlot) +GetObjectPaletteTagBySlot: ; 800883C lsls r0, 24 ldr r1, =0x03000cf0 lsrs r0, 23 @@ -4160,15 +4183,15 @@ gpu_pal_tag_by_index: ; 800883C ldrh r0, [r0] bx lr .pool - thumb_func_end gpu_pal_tag_by_index + thumb_func_end GetObjectPaletteTagBySlot - thumb_func_start gpu_pal_free_tag -; void gpu_pal_free_tag(int tag) -gpu_pal_free_tag: ; 800884C + thumb_func_start FreeObjectPaletteByTag +; void FreeObjectPaletteByTag(int tag) +FreeObjectPaletteByTag: ; 800884C push {lr} lsls r0, 16 lsrs r0, 16 - bl gpu_pal_tags_index_of + bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xFF @@ -4182,21 +4205,21 @@ gpu_pal_free_tag: ; 800884C pop {r0} bx r0 .pool - thumb_func_end gpu_pal_free_tag + thumb_func_end FreeObjectPaletteByTag - thumb_func_start obj_set_f18_to_r0_f42_to_40 -; void obj_set_f18_to_r0_f42_to_40(struct obj *obj, int a2) -obj_set_f18_to_r0_f42_to_40: ; 8008874 + thumb_func_start SetSpriteOamTables_NoPriorityFromTable +; void SetSpriteOamTables_NoPriorityFromTable(struct obj *object, u32 spriteOamTables) +SetSpriteOamTables_NoPriorityFromTable: ; 8008874 str r1, [r0, 0x18] adds r0, 0x42 movs r1, 0x40 strb r1, [r0] bx lr - thumb_func_end obj_set_f18_to_r0_f42_to_40 + thumb_func_end SetSpriteOamTables_NoPriorityFromTable - thumb_func_start super_sprite_add -; int super_sprite_add(struct obj *obj, u8 *index) -super_sprite_add: ; 8008880 + thumb_func_start AddSprite +; u8 AddSprite(struct obj *obj, u8 *spriteIndex) +AddSprite: ; 8008880 push {r4,lr} adds r4, r0, 0 adds r3, r1, 0 @@ -4242,7 +4265,7 @@ super_sprite_add: ; 8008880 adds r1, r0 adds r0, r4, 0 adds r2, r3, 0 - bl sub_80088EC + bl AddSpritesFromSpriteOamTable lsls r0, 24 lsrs r0, 24 @080088E0: @@ -4250,11 +4273,11 @@ super_sprite_add: ; 8008880 pop {r1} bx r1 .pool - thumb_func_end super_sprite_add + thumb_func_end AddSprite - thumb_func_start sub_80088EC -; int sub_80088EC(struct obj *obj, struct sprite *a2, int a3) -sub_80088EC: ; 80088EC + thumb_func_start AddSpritesFromSpriteOamTable +; u8 AddSpritesFromSpriteOamTable(struct obj *object, struct sprite *sprite, u8 *spriteIndex) +AddSpritesFromSpriteOamTable: ; 80088EC push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -4527,4 +4550,4 @@ sub_80088EC: ; 80088EC pop {r1} bx r1 .pool - thumb_func_end sub_80088EC + thumb_func_end AddSpritesFromSpriteOamTable diff --git a/asm/main.s b/asm/main.s index de7c59d37..5d622298a 100644 --- a/asm/main.s +++ b/asm/main.s @@ -91,7 +91,7 @@ Main: bne @080004B2 movs r0, 0 strh r0, [r7, 0x2E] - bl copy_queue_clear + bl ClearObjectCopyRequests strb r4, [r5] bl HandleLinkConnectionAndCallMainCallbacks mov r2, r8 diff --git a/asm/main_menu.s b/asm/main_menu.s index 4e78d9e50..aa49d06c0 100644 --- a/asm/main_menu.s +++ b/asm/main_menu.s @@ -3,8 +3,8 @@ CB2_MainMenu: ; 802F6B0 push {lr} bl run_active_tasks - bl call_obj_callbacks - bl obj_sync_something + bl CallObjectCallbacks + bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r0} bx r0 @@ -14,8 +14,8 @@ CB2_MainMenu: ; 802F6B0 ; void VBlankCB_MainMenu() VBlankCB_MainMenu: ; 802F6C8 push {lr} - bl copy_super_sprites_to_oam - bl copy_queue_process + bl LoadOamFromSprites + bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -122,8 +122,8 @@ InitMainMenu: ; 802F6F4 bl gpu_pal_apply bl remove_some_task bl clear_tasks - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator cmp r4, 0 beq @0802F7EC movs r0, 0x1 @@ -421,7 +421,7 @@ Task_WaitForSaveFileErrorWindow: ; 802FA5C cmp r0, 0 beq @0802FA98 movs r0, 0x7 - bl ClearWindowTileMap + bl ClearWindowTilemap ldr r0, =gUnknown_082FF070 bl sub_8032250 ldr r1, =0x03005e00 @@ -523,7 +523,7 @@ Task_WaitForBatteryDryErrorWindow: ; 802FB50 cmp r0, 0 beq @0802FB8C movs r0, 0x7 - bl ClearWindowTileMap + bl ClearWindowTilemap ldr r0, =gUnknown_082FF070 bl sub_8032250 ldr r1, =0x03005e00 @@ -689,9 +689,9 @@ Task_DisplayMainMenu: ; 802FBA4 movs r3, 0x1 bl box_print movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 movs r1, 0x2 bl CopyWindowToVram @@ -748,11 +748,11 @@ Task_DisplayMainMenu: ; 802FBA4 bl box_print bl fmt_savegame movs r0, 0x2 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x3 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x4 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x2 movs r1, 0x2 bl CopyWindowToVram @@ -828,13 +828,13 @@ Task_DisplayMainMenu: ; 802FBA4 bl box_print bl fmt_savegame movs r0, 0x2 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x3 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x4 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x5 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x2 movs r1, 0x2 bl CopyWindowToVram @@ -933,15 +933,15 @@ Task_DisplayMainMenu: ; 802FBA4 bl box_print bl fmt_savegame movs r0, 0x2 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x3 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x4 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x5 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x6 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x2 movs r1, 0x2 bl CopyWindowToVram @@ -1649,7 +1649,7 @@ Task_DisplayMainMenuInvalidActionError: ; 80305A4 movs r1, 0 movs r2, 0 movs r3, 0 - bl FillBgTileMapBufferRect_Palette0 + bl FillBgTilemapBufferRect_Palette0 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 @@ -1923,8 +1923,8 @@ task_new_game_prof_birch_speech_1: ; 80307B0 movs r2, 0x10 bl gpu_pal_apply bl remove_some_task - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator bl dp13_810BB8C adds r0, r4, 0 bl AddBirchSpeechObjects @@ -2073,7 +2073,7 @@ task_new_game_prof_birch_speech_3: ; 8030928 movs r1, 0x1 bl unknown_rbox_to_vram movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 movs r1, 0x2 bl CopyWindowToVram @@ -3702,8 +3702,8 @@ new_game_prof_birch_speech_part2_start: ; 8031678 ldr r0, =0x0000ffc4 strh r0, [r4, 0x10] bl remove_some_task - bl reset_all_obj_data - bl gpu_pal_allocator_reset + bl ResetAllObjectData + bl ResetObjectPaletteAllocator bl dp13_810BB8C adds r0, r5, 0 bl AddBirchSpeechObjects @@ -3800,7 +3800,7 @@ new_game_prof_birch_speech_part2_start: ; 8031678 movs r2, 0xF0 bl copy_textbox_border_tile_patterns_to_vram movs r0, 0 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0 movs r1, 0x3 bl CopyWindowToVram @@ -4421,7 +4421,7 @@ sub_8031D74: ; 8031D74 movs r2, 0 bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed movs r0, 0x1 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x1 movs r1, 0x3 bl CopyWindowToVram @@ -4504,7 +4504,7 @@ CreateMainMenuErrorWindow: ; 8031E18 movs r3, 0 bl Print movs r0, 0x7 - bl PutWindowTileMap + bl PutWindowTilemap movs r0, 0x7 movs r1, 0x2 bl CopyWindowToVram @@ -4858,7 +4858,7 @@ DrawMainMenuWindowFrame: ; 80320EC movs r7, 0x2 mov r8, r7 str r7, [sp, 0x8] - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldrb r0, [r4] ldrb r2, [r4, 0x1] ldrb r3, [r4, 0x2] @@ -4870,7 +4870,7 @@ DrawMainMenuWindowFrame: ; 80320EC str r5, [sp, 0x4] str r7, [sp, 0x8] mov r1, r9 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldrb r0, [r4] ldrb r2, [r4, 0x3] ldrb r1, [r4, 0x1] @@ -4885,7 +4885,7 @@ DrawMainMenuWindowFrame: ; 80320EC str r5, [sp, 0x4] str r7, [sp, 0x8] mov r1, r10 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldrb r0, [r4] ldrb r2, [r4, 0x1] subs r2, 0x1 @@ -4897,7 +4897,7 @@ DrawMainMenuWindowFrame: ; 80320EC str r1, [sp, 0x4] str r7, [sp, 0x8] ldr r1, [sp, 0x18] - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldrb r0, [r4] ldrb r2, [r4, 0x3] ldrb r7, [r4, 0x1] @@ -4911,7 +4911,7 @@ DrawMainMenuWindowFrame: ; 80320EC mov r1, r8 str r1, [sp, 0x8] ldr r1, [sp, 0xC] - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldrb r0, [r4] ldrb r2, [r4, 0x1] subs r2, 0x1 @@ -4927,7 +4927,7 @@ DrawMainMenuWindowFrame: ; 80320EC mov r1, r8 str r1, [sp, 0x8] ldr r1, [sp, 0x10] - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldrb r0, [r4] ldrb r2, [r4, 0x1] ldrb r3, [r4, 0x4] @@ -4941,7 +4941,7 @@ DrawMainMenuWindowFrame: ; 80320EC mov r1, r8 str r1, [sp, 0x8] ldr r1, [sp, 0x14] - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldrb r0, [r4] ldrb r2, [r4, 0x3] ldrb r7, [r4, 0x1] @@ -4958,9 +4958,9 @@ DrawMainMenuWindowFrame: ; 80320EC mov r7, r8 str r7, [sp, 0x8] adds r1, r6, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldrb r0, [r4] - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0x1C pop {r3-r5} mov r8, r3 @@ -5000,9 +5000,9 @@ sub_8032250: ; 8032250 movs r1, 0x2 str r1, [sp, 0x8] movs r1, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldrb r0, [r6] - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram add sp, 0xC pop {r4-r6} pop {r0} @@ -5041,7 +5041,7 @@ sub_8032298: ; 8032298 movs r1, 0 adds r2, r4, 0 adds r3, r5, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect add sp, 0xC pop {r4,r5} pop {r0} @@ -5063,7 +5063,7 @@ sub_80322E0: ; 80322E0 movs r1, 0x11 bl FillWindowPixelBuffer adds r0, r5, 0 - bl ClearWindowTileMap + bl ClearWindowTilemap cmp r4, 0x1 bne @0803230E adds r0, r5, 0 @@ -5236,7 +5236,7 @@ unknown_rbox_to_vram: ; 803243C movs r1, 0x11 bl FillWindowPixelBuffer adds r0, r5, 0 - bl PutWindowTileMap + bl PutWindowTilemap cmp r4, 0x1 bne @0803246A adds r0, r5, 0 @@ -5298,7 +5298,7 @@ sub_8032474: ; 8032474 movs r1, 0xFD ldr r2, [sp, 0x14] adds r3, r5, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r0, [sp, 0xC] subs r0, 0x1 lsls r2, r0, 24 @@ -5310,7 +5310,7 @@ sub_8032474: ; 8032474 mov r0, r8 movs r1, 0xFF adds r3, r5, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r1, 0x80 lsls r1, 1 mov r0, r9 @@ -5320,7 +5320,7 @@ sub_8032474: ; 8032474 mov r0, r8 ldr r2, [sp, 0xC] adds r3, r5, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x00000101 ldr r7, [sp, 0xC] add r7, r9 @@ -5333,7 +5333,7 @@ sub_8032474: ; 8032474 str r6, [sp, 0x8] mov r0, r8 adds r3, r5, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r1, 0x81 lsls r1, 1 lsls r2, r7, 24 @@ -5344,7 +5344,7 @@ sub_8032474: ; 8032474 mov r0, r8 adds r2, r7, 0 adds r3, r5, 0 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x00000103 str r4, [sp] movs r5, 0x5 @@ -5353,7 +5353,7 @@ sub_8032474: ; 8032474 mov r0, r8 ldr r2, [sp, 0x14] mov r3, r10 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x00000105 mov r0, r9 adds r0, 0x1 @@ -5365,7 +5365,7 @@ sub_8032474: ; 8032474 mov r0, r8 ldr r2, [sp, 0x18] mov r3, r10 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r1, 0x83 lsls r1, 1 str r4, [sp] @@ -5374,7 +5374,7 @@ sub_8032474: ; 8032474 mov r0, r8 adds r2, r7, 0 mov r3, r10 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x000008fd ldr r2, [sp, 0x10] add r10, r2 @@ -5388,7 +5388,7 @@ sub_8032474: ; 8032474 mov r0, r8 ldr r2, [sp, 0x14] mov r3, r10 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x000008ff str r4, [sp] str r4, [sp, 0x4] @@ -5396,7 +5396,7 @@ sub_8032474: ; 8032474 mov r0, r8 ldr r2, [sp, 0x18] mov r3, r10 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect movs r1, 0x90 lsls r1, 4 movs r2, 0x1 @@ -5411,7 +5411,7 @@ sub_8032474: ; 8032474 mov r0, r8 ldr r2, [sp, 0xC] mov r3, r10 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x00000901 str r4, [sp] str r4, [sp, 0x4] @@ -5419,7 +5419,7 @@ sub_8032474: ; 8032474 mov r0, r8 ldr r2, [sp, 0x1C] mov r3, r10 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect ldr r1, =0x00000902 str r4, [sp] str r4, [sp, 0x4] @@ -5427,7 +5427,7 @@ sub_8032474: ; 8032474 mov r0, r8 adds r2, r7, 0 mov r3, r10 - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect add sp, 0x20 pop {r3-r5} mov r8, r3 diff --git a/asm/window.s b/asm/window.s index 26ad6eded..24618de20 100644 --- a/asm/window.s +++ b/asm/window.s @@ -20,7 +20,7 @@ InitWindows: ; 80031C0 mov r1, r8 lsls r0, r1, 24 lsrs r0, 24 - bl GetBgTileMap + bl GetBgTilemap cmp r0, 0 beq @080031E4 ldr r0, =nullsub_8 @@ -129,7 +129,7 @@ InitWindows: ; 80031C0 str r4, [r0] adds r0, r7, 0 adds r1, r4, 0 - bl SetBgTileMap + bl SetBgTilemap @080032CA: ldrb r1, [r6, 0x3] ldrb r0, [r6, 0x4] @@ -307,7 +307,7 @@ AddWindow: ; 8003380 str r4, [r0] adds r0, r7, 0 adds r1, r4, 0 - bl SetBgTileMap + bl SetBgTilemap @08003432: mov r2, r8 ldrb r1, [r2, 0x3] @@ -610,7 +610,7 @@ CopyWindowToVram: ; 8003658 @0800369A: mov r0, sp ldrb r0, [r0] - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @080036CE @080036A4: mov r0, sp @@ -631,7 +631,7 @@ CopyWindowToVram: ; 8003658 bl LoadBgTiles mov r0, sp ldrb r0, [r0] - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @080036CE: add sp, 0xC pop {r4-r6} @@ -692,7 +692,7 @@ CopyWindowRectToVram: ; 80036D8 @08003736: mov r0, sp ldrb r0, [r0] - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @08003782 @08003740: mov r0, sp @@ -725,7 +725,7 @@ CopyWindowRectToVram: ; 80036D8 bl LoadBgTiles mov r0, sp ldrb r0, [r0] - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @08003782: add sp, 0xC pop {r4-r7} @@ -733,9 +733,9 @@ CopyWindowRectToVram: ; 80036D8 bx r0 thumb_func_end CopyWindowRectToVram - thumb_func_start PutWindowTileMap -; void PutWindowTileMap(u8 windowId) -PutWindowTileMap: ; 800378C + thumb_func_start PutWindowTilemap +; void PutWindowTilemap(u8 windowId) +PutWindowTilemap: ; 800378C push {r4,lr} sub sp, 0x1C lsls r0, 24 @@ -775,17 +775,17 @@ PutWindowTileMap: ; 800378C str r4, [sp, 0x8] movs r4, 0x1 str r4, [sp, 0xC] - bl WriteSequenceToBgTileMapBuffer + bl WriteSequenceToBgTilemapBuffer add sp, 0x1C pop {r4} pop {r0} bx r0 .pool - thumb_func_end PutWindowTileMap + thumb_func_end PutWindowTilemap - thumb_func_start PutWindowRectTileMapOverridePalette -; void PutWindowRectTileMapOverridePalette(u8 windowId, u8 x, u8 y, u8 width, u8 height, u8 palette) -PutWindowRectTileMapOverridePalette: ; 80037EC + thumb_func_start PutWindowRectTilemapOverridePalette +; void PutWindowRectTilemapOverridePalette(u8 windowId, u8 x, u8 y, u8 width, u8 height, u8 palette) +PutWindowRectTilemapOverridePalette: ; 80037EC push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -858,7 +858,7 @@ PutWindowRectTileMapOverridePalette: ; 80037EC str r1, [sp, 0x8] str r7, [sp, 0xC] adds r1, r6, 0 - bl WriteSequenceToBgTileMapBuffer + bl WriteSequenceToBgTilemapBuffer ldrb r0, [r4, 0x3] adds r0, r6, r0 lsls r0, 16 @@ -876,11 +876,11 @@ PutWindowRectTileMapOverridePalette: ; 80037EC pop {r0} bx r0 .pool - thumb_func_end PutWindowRectTileMapOverridePalette + thumb_func_end PutWindowRectTilemapOverridePalette - thumb_func_start ClearWindowTileMap -; void ClearWindowTileMap(u8 windowId) -ClearWindowTileMap: ; 80038A4 + thumb_func_start ClearWindowTilemap +; void ClearWindowTilemap(u8 windowId) +ClearWindowTilemap: ; 80038A4 push {r4,lr} sub sp, 0x18 lsls r0, 24 @@ -910,17 +910,17 @@ ClearWindowTileMap: ; 80038A4 add r4, sp, 0xC ldrb r4, [r4, 0x5] str r4, [sp, 0x8] - bl FillBgTileMapBufferRect + bl FillBgTilemapBufferRect add sp, 0x18 pop {r4} pop {r0} bx r0 .pool - thumb_func_end ClearWindowTileMap + thumb_func_end ClearWindowTilemap - thumb_func_start PutWindowRectTileMap -; void PutWindowRectTileMap(u8 windowId, u8 x, u8 y, u8 width, u8 height) -PutWindowRectTileMap: ; 80038F4 + thumb_func_start PutWindowRectTilemap +; void PutWindowRectTilemap(u8 windowId, u8 x, u8 y, u8 width, u8 height) +PutWindowRectTilemap: ; 80038F4 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -989,7 +989,7 @@ PutWindowRectTileMap: ; 80038F4 str r1, [sp, 0x8] str r7, [sp, 0xC] adds r1, r6, 0 - bl WriteSequenceToBgTileMapBuffer + bl WriteSequenceToBgTilemapBuffer ldrb r0, [r4, 0x3] adds r0, r6, r0 lsls r0, 16 @@ -1007,7 +1007,7 @@ PutWindowRectTileMap: ; 80038F4 pop {r0} bx r0 .pool - thumb_func_end PutWindowRectTileMap + thumb_func_end PutWindowRectTilemap thumb_func_start BlitBitmapToWindow ; void BlitBitmapToWindow(u8 windowId, u8 *pixels, u16 x, u16 y, u16 width, u16 height) @@ -2247,7 +2247,7 @@ AddWindow8Bit: ; 8004260 str r4, [r0] adds r0, r7, 0 adds r1, r4, 0 - bl SetBgTileMap + bl SetBgTilemap @080042EA: mov r2, r9 ldrb r1, [r2, 0x3] @@ -2547,7 +2547,7 @@ CopyWindowToVram8Bit: ; 8004500 b @08004570 @08004546: ldrb r0, [r3] - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram b @08004570 @0800454E: ldrb r0, [r3] @@ -2564,7 +2564,7 @@ CopyWindowToVram8Bit: ; 8004500 bl LoadBgTiles ldr r0, [r6] ldrb r0, [r0] - bl CopyBgTileMapBufferToVram + bl CopyBgTilemapBufferToVram @08004570: pop {r4-r6} pop {r0} diff --git a/data/data2.s b/data/data2.s index 32e772da8..38dbdf53a 100644 --- a/data/data2.s +++ b/data/data2.s @@ -31,7 +31,7 @@ gRomInterruptTable: ; 82E9548 .4byte DummyIntrHandler .4byte DummyIntrHandler -gBgConfigZeroValue: ; 82E9580 +gZeroedBgControlStruct: ; 82E9580 .4byte 0 gDummyWindowTemplate: ; 82E9584 |