add type signatures

- many of these probably have mistakes

asm/dma3_manager.s

@@ -1,5 +1,6 @@
-	thumb_func_start dma3_transfer_queue_clear
+	thumb_func_start ClearDma3Requests
-dma3_transfer_queue_clear: @ 8000BB8
+@ void ClearDma3Requests()
+ClearDma3Requests: @ 8000BB8
 	push {lr}
 	ldr r2, =0x03000810
 	movs r0, 0x1
@@ -24,10 +25,11 @@ _08000BCC:
 	bx r0
 	.align 2, 0
 	.pool
-	thumb_func_end dma3_transfer_queue_clear
+	thumb_func_end ClearDma3Requests
 
-	thumb_func_start dma_transfer_queue_process
+	thumb_func_start ProcessDma3Requests
-dma_transfer_queue_process: @ 8000BF0
+@ void ProcessDma3Requests()
+ProcessDma3Requests: @ 8000BF0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -341,10 +343,11 @@ _08000E46:
 	bx r0
 	.align 2, 0
 	.pool
-	thumb_func_end dma_transfer_queue_process
+	thumb_func_end ProcessDma3Requests
 
-	thumb_func_start dma3_transfer_queue_add_copy
+	thumb_func_start RequestDma3Copy
-dma3_transfer_queue_add_copy: @ 8000E68
+@ int RequestDma3Copy(void *src, void *dest, u16 size, u8 mode)
+RequestDma3Copy: @ 8000E68
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -422,10 +425,11 @@ _08000EF0:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end dma3_transfer_queue_add_copy
+	thumb_func_end RequestDma3Copy
 
-	thumb_func_start dma3_transfer_queue_add_fill
+	thumb_func_start RequestDma3Fill
-dma3_transfer_queue_add_fill: @ 8000F00
+@ int RequestDma3Fill(s32 value, void *dest, u16 size, u8 mode)
+RequestDma3Fill: @ 8000F00
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -509,10 +513,11 @@ _08000F96:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end dma3_transfer_queue_add_fill
+	thumb_func_end RequestDma3Fill
 
-	thumb_func_start dma3_transfer_queue_check_for_space
+	thumb_func_start CheckForSpaceForDma3Request
-dma3_transfer_queue_check_for_space: @ 8000FA4
+@ int CheckForSpaceForDma3Request(s16 index)
+CheckForSpaceForDma3Request: @ 8000FA4
 	push {lr}
 	movs r2, 0
 	lsls r0, 16
@@ -550,4 +555,4 @@ _08000FDC:
 	bx r1
 	.align 2, 0
 	.pool
-	thumb_func_end dma3_transfer_queue_check_for_space
+	thumb_func_end CheckForSpaceForDma3Request

asm/gpu_bg.s

@@ -1,4 +1,5 @@
 	thumb_func_start gpu_init_bgs
+@ void gpu_init_bgs()
 gpu_init_bgs: @ 80012F0
 	push {lr}
 	bl gpu_reset_bg_configs
@@ -13,6 +14,7 @@ gpu_init_bgs: @ 80012F0
 	thumb_func_end gpu_init_bgs
 
 	thumb_func_start gpu_set_bg_mode
+@ void gpu_set_bg_mode(u8 bg_mode)
 gpu_set_bg_mode: @ 8001308
 	lsls r0, 24
 	lsrs r0, 24
@@ -28,6 +30,7 @@ gpu_set_bg_mode: @ 8001308
 	thumb_func_end gpu_set_bg_mode
 
 	thumb_func_start gpu_get_bg_mode
+@ u8 gpu_get_bg_mode()
 gpu_get_bg_mode: @ 8001324
 	ldr r0, =0x030008e0
 	ldrb r1, [r0, 0x10]
@@ -39,6 +42,7 @@ gpu_get_bg_mode: @ 8001324
 	thumb_func_end gpu_get_bg_mode
 
 	thumb_func_start gpu_reset_bg_configs
+@ void gpu_reset_bg_configs()
 gpu_reset_bg_configs: @ 8001334
 	push {lr}
 	ldr r2, =0x030008e0
@@ -82,6 +86,7 @@ _08001372:
 	thumb_func_end sub_8001354
 
 	thumb_func_start gpu_bg_config_set_fields
+@ void gpu_bg_config_set_fields(u8 bg_id, u8 character_base_block, u8 screen_base_block, u8 screen_size, u8 palette_size_select, u8 priority, u8 mosaic, u8 wraparound)
 gpu_bg_config_set_fields: @ 8001380
 	push {r4-r7,lr}
 	mov r7, r10
@@ -243,6 +248,7 @@ _08001498:
 	thumb_func_end gpu_bg_config_set_fields
 
 	thumb_func_start gpu_bg_config_get_field
+@ int gpu_bg_config_get_field(u8 bg_id, u8 field_id)
 gpu_bg_config_get_field: @ 80014AC
 	push {r4,r5,lr}
 	lsls r0, 24
@@ -337,6 +343,7 @@ _0800155A:
 	thumb_func_end gpu_bg_config_get_field
 
 	thumb_func_start gpu_copy_to_vram_by_bg_id
+@ s8 gpu_copy_to_vram_by_bg_id(u8 bg_id, int src, u16 byte_count, u16 dest_offset, gpu_copy_to_vram_type type)
 gpu_copy_to_vram_by_bg_id: @ 8001560
 	push {r4-r7,lr}
 	mov r7, r8
@@ -391,7 +398,7 @@ _080015B4:
 	mov r0, r8
 	adds r2, r7, 0
 	movs r3, 0
-	bl dma3_transfer_queue_add_copy
+	bl RequestDma3Copy
 	lsls r0, 24
 	lsrs r2, r0, 24
 	asrs r0, 24
@@ -413,6 +420,7 @@ _080015DE:
 	thumb_func_end gpu_copy_to_vram_by_bg_id
 
 	thumb_func_start gpu_bg_show
+@ void gpu_bg_show(u8 bg_id)
 gpu_bg_show: @ 80015E8
 	push {r4,r5,lr}
 	lsls r0, 24
@@ -476,6 +484,7 @@ _08001656:
 	thumb_func_end gpu_bg_show
 
 	thumb_func_start gpu_bg_hide
+@ void gpu_bg_hide(u8 bg_id)
 gpu_bg_hide: @ 8001664
 	push {r4,lr}
 	lsls r0, 24
@@ -504,6 +513,7 @@ _0800168A:
 	thumb_func_end gpu_bg_hide
 
 	thumb_func_start gpu_sync_bg_visibility_and_mode
+@ void gpu_sync_bg_visibility_and_mode()
 gpu_sync_bg_visibility_and_mode: @ 8001698
 	push {lr}
 	movs r0, 0
@@ -522,6 +532,7 @@ gpu_sync_bg_visibility_and_mode: @ 8001698
 	thumb_func_end gpu_sync_bg_visibility_and_mode
 
 	thumb_func_start gpu_sync_text_mode_and_hide_bgs
+@ void gpu_sync_text_mode_and_hide_bgs()
 gpu_sync_text_mode_and_hide_bgs: @ 80016BC
 	push {lr}
 	movs r0, 0
@@ -537,6 +548,7 @@ gpu_sync_text_mode_and_hide_bgs: @ 80016BC
 	thumb_func_end gpu_sync_text_mode_and_hide_bgs
 
 	thumb_func_start gpu_bg_affine_set
+@ void gpu_bg_affine_set(u8 bg_id, int bg_center_x, int bg_center_y, u16 display_center_x, s16 display_center_y, s16 scale_x, s16 scale_y, s16 rotation_angle)
 gpu_bg_affine_set: @ 80016D8
 	push {r4-r7,lr}
 	mov r7, r8
@@ -635,6 +647,7 @@ _08001796:
 	thumb_func_end gpu_bg_affine_set
 
 	thumb_func_start is_invalid_bg_id
+@ _BOOL1 is_invalid_bg_id(u8 bg_id)
 is_invalid_bg_id: @ 80017A4
 	push {lr}
 	lsls r0, 24
@@ -651,12 +664,14 @@ _080017B4:
 	thumb_func_end is_invalid_bg_id
 
 	thumb_func_start do_nothing
+@ int do_nothing()
 do_nothing: @ 80017B8
 	movs r0, 0
 	bx lr
 	thumb_func_end do_nothing
 
 	thumb_func_start gpu_reset_bgs_and_dma3_busy_flags
+@ void gpu_reset_bgs_and_dma3_busy_flags(int a1)
 gpu_reset_bgs_and_dma3_busy_flags: @ 80017BC
 	push {r4,lr}
 	adds r4, r0, 0
@@ -680,6 +695,7 @@ _080017CC:
 	thumb_func_end gpu_reset_bgs_and_dma3_busy_flags
 
 	thumb_func_start bg_vram_setup
+@ void bg_vram_setup(u8 bg_mode, struct bg_config3 *bg_config3s, u8 entry_count)
 bg_vram_setup: @ 80017E8
 	push {r4-r7,lr}
 	mov r7, r10
@@ -780,6 +796,7 @@ _08001894:
 	thumb_func_end bg_vram_setup
 
 	thumb_func_start bg_init_bg_config_2_from_bg_config_3
+@ void bg_init_bg_config_2_from_bg_config_3(struct bg_config_3 *bg)
 bg_init_bg_config_2_from_bg_config_3: @ 80018B0
 	push {r4-r7,lr}
 	sub sp, 0x10
@@ -846,6 +863,7 @@ _08001920:
 	thumb_func_end bg_init_bg_config_2_from_bg_config_3
 
 	thumb_func_start call_gpu_set_bg_mode
+@ void call_gpu_set_bg_mode(u8 bg_id)
 call_gpu_set_bg_mode: @ 8001934
 	push {lr}
 	lsls r0, 24
@@ -856,6 +874,7 @@ call_gpu_set_bg_mode: @ 8001934
 	thumb_func_end call_gpu_set_bg_mode
 
 	thumb_func_start gpu_copy_bg_tile_pattern_data_to_vram
+@ s16 gpu_copy_bg_tile_pattern_data_to_vram(u8 bg_id, int src, u16 size, u16 offset)
 gpu_copy_bg_tile_pattern_data_to_vram: @ 8001944
 	push {r4-r7,lr}
 	mov r7, r8
@@ -1022,7 +1041,7 @@ unused_copy_palette: @ 8001A4C
 	adds r0, r7, 0
 	adds r2, r6, 0
 	movs r3, 0
-	bl dma3_transfer_queue_add_copy
+	bl RequestDma3Copy
 	lsls r3, r0, 24
 	asrs r1, r3, 24
 	movs r0, 0x1
@@ -1063,6 +1082,7 @@ _08001AC8:
 	thumb_func_end unused_copy_palette
 
 	thumb_func_start is_dma3_queue_busy_with_gpu_copy
+@ int is_dma3_queue_busy_with_gpu_copy()
 is_dma3_queue_busy_with_gpu_copy: @ 8001AD4
 	push {r4-r7,lr}
 	movs r5, 0
@@ -1091,7 +1111,7 @@ _08001AE4:
 	beq _08001B22
 	lsls r0, r5, 16
 	asrs r0, 16
-	bl dma3_transfer_queue_check_for_space
+	bl CheckForSpaceForDma3Request
 	lsls r0, 24
 	asrs r0, 24
 	cmp r0, r7
@@ -1116,6 +1136,7 @@ _08001B2A:
 	thumb_func_end is_dma3_queue_busy_with_gpu_copy
 
 	thumb_func_start gpu_sync_bg_show
+@ void gpu_sync_bg_show(u8 bg_id)
 gpu_sync_bg_show: @ 8001B30
 	push {lr}
 	lsls r0, 24
@@ -1127,6 +1148,7 @@ gpu_sync_bg_show: @ 8001B30
 	thumb_func_end gpu_sync_bg_show
 
 	thumb_func_start gpu_sync_bg_hide
+@ void gpu_sync_bg_hide(u8 bg_id)
 gpu_sync_bg_hide: @ 8001B44
 	push {lr}
 	lsls r0, 24
@@ -1138,6 +1160,7 @@ gpu_sync_bg_hide: @ 8001B44
 	thumb_func_end gpu_sync_bg_hide
 
 	thumb_func_start gpu_bg_config_set_field
+@ int gpu_bg_config_set_field(u8 bg_id, bg_config_get_field field_id, u8 value)
 gpu_bg_config_set_field: @ 8001B58
 	push {r4,lr}
 	sub sp, 0x10
@@ -1356,6 +1379,7 @@ _08001CFA:
 	thumb_func_end bg_get_field
 
 	thumb_func_start bg_change_x_offset
+@ int bg_change_x_offset(u8 bg_id, int offset, u8 operation)
 bg_change_x_offset: @ 8001D04
 	push {r4-r6,lr}
 	adds r6, r1, 0
@@ -1518,6 +1542,7 @@ _08001E34:
 	thumb_func_end bg_change_x_offset
 
 	thumb_func_start bg_get_x_offset
+@ int bg_get_x_offset(u8 bg_id)
 bg_get_x_offset: @ 8001E40
 	push {r4,lr}
 	lsls r0, 24
@@ -1550,6 +1575,7 @@ _08001E74:
 	thumb_func_end bg_get_x_offset
 
 	thumb_func_start bg_change_y_offset
+@ int bg_change_y_offset(u8 bg_id, int offset, u8 operation)
 bg_change_y_offset: @ 8001E7C
 	push {r4-r6,lr}
 	adds r6, r1, 0
@@ -1712,6 +1738,7 @@ _08001FAC:
 	thumb_func_end bg_change_y_offset
 
 	thumb_func_start bg_change_y_offset_to_copy_queue
+@ int bg_change_y_offset_to_copy_queue(u8 bg_id, int a2, u8 a3)
 bg_change_y_offset_to_copy_queue: @ 8001FB8
 	push {r4-r6,lr}
 	adds r6, r1, 0
@@ -1874,6 +1901,7 @@ _080020E8:
 	thumb_func_end bg_change_y_offset_to_copy_queue
 
 	thumb_func_start bg_get_y_offset
+@ int bg_get_y_offset(u8 bg_id)
 bg_get_y_offset: @ 80020F4
 	push {r4,lr}
 	lsls r0, 24
@@ -1906,6 +1934,7 @@ _08002128:
 	thumb_func_end bg_get_y_offset
 
 	thumb_func_start call_gpu_bg_affine_set
+@ void call_gpu_bg_affine_set(u8 a1, int a2, int a3, u16 a4, s16 a5, s16 a6, s16 a7, s16 a8)
 call_gpu_bg_affine_set: @ 8002130
 	push {r4-r7,lr}
 	mov r7, r8
@@ -2063,6 +2092,7 @@ _08002226:
 	thumb_func_end mosaic_something
 
 	thumb_func_start bg_set_tilemap
+@ void bg_set_tilemap(u8 bg_id, int tilemap)
 bg_set_tilemap: @ 8002250
 	push {r4,r5,lr}
 	adds r5, r1, 0
@@ -2092,6 +2122,7 @@ _0800227A:
 	thumb_func_end bg_set_tilemap
 
 	thumb_func_start bg_unset_tilemap
+@ void bg_unset_tilemap(u8 bg_id)
 bg_unset_tilemap: @ 8002284
 	push {r4,r5,lr}
 	lsls r0, 24
@@ -2121,6 +2152,7 @@ _080022AE:
 	thumb_func_end bg_unset_tilemap
 
 	thumb_func_start bg_get_tilemap
+@ int bg_get_tilemap(u8 bg_id)
 bg_get_tilemap: @ 80022B8
 	push {r4,lr}
 	lsls r0, 24
@@ -2152,6 +2184,7 @@ _080022EA:
 	thumb_func_end bg_get_tilemap
 
 	thumb_func_start gpu_copy_to_wram_bg_tile_map
+@ void gpu_copy_to_wram_bg_tile_map(u8 bg_id, void *src, int mode, int dest_offset)
 gpu_copy_to_wram_bg_tile_map: @ 80022F0
 	push {r4-r7,lr}
 	mov r7, r10
@@ -2215,6 +2248,7 @@ _08002358:
 	thumb_func_end gpu_copy_to_wram_bg_tile_map
 
 	thumb_func_start gpu_copy_wram_bg_tilemap_to_vram
+@ void gpu_copy_wram_bg_tilemap_to_vram(int bg_id)
 gpu_copy_wram_bg_tilemap_to_vram: @ 800236C
 	push {r4,lr}
 	sub sp, 0x4
@@ -2270,6 +2304,7 @@ _080023C8:
 	thumb_func_end gpu_copy_wram_bg_tilemap_to_vram
 
 	thumb_func_start gpu_copy_to_iwram_tile_map_rect
+@ void gpu_copy_to_iwram_tile_map_rect(u8 bg_id, int first_tile_num, u8 tilemap_x, u8 tilemap_y, u8 width_in_tiles, u8 height_in_tiles)
 gpu_copy_to_iwram_tile_map_rect: @ 80023D4
 	push {r4-r7,lr}
 	mov r7, r10
@@ -2408,6 +2443,7 @@ _080024C4:
 	thumb_func_end gpu_copy_to_iwram_tile_map_rect
 
 	thumb_func_start bg_copy_tilemap_rect_simple
+@ void bg_copy_tilemap_rect_simple(u8 bg_id, void *src, u8 dest_x, u8 dest_y, u8 w, u8 h, u8 a7)
 bg_copy_tilemap_rect_simple: @ 80024D8
 	push {r4-r6,lr}
 	sub sp, 0x24
@@ -2445,6 +2481,7 @@ bg_copy_tilemap_rect_simple: @ 80024D8
 	thumb_func_end bg_copy_tilemap_rect_simple
 
 	thumb_func_start bg_copy_tilemap_rect
+@ void bg_copy_tilemap_rect(u8 bg_id, void *src, u8 src_x, u8 src_y, u8 src_w, int src_h, u8 dest_x, u8 dest_y, u8 dest_w, u8 dest_h, u8 a11, int tile_num_delta, s16 a13)
 bg_copy_tilemap_rect: @ 800251C
 	push {r4-r7,lr}
 	mov r7, r10
@@ -2694,6 +2731,7 @@ _080026EE:
 	thumb_func_end bg_copy_tilemap_rect
 
 	thumb_func_start bg_fill_tilemap_rect
+@ void bg_fill_tilemap_rect(u8 bg_id, s16 tile, u8 x, u8 y, u8 w, u8 h)
 bg_fill_tilemap_rect: @ 8002704
 	push {r4-r7,lr}
 	mov r7, r10
@@ -2830,6 +2868,7 @@ _080027F0:
 	thumb_func_end bg_fill_tilemap_rect
 
 	thumb_func_start Bg_FillWramTileMapRectWithTileAndPalette
+@ void Bg_FillWramTileMapRectWithTileAndPalette(u8 bg_id, s16 tile_num, u8 tilemap_x, u8 tilemap_y, u8 width_in_tiles, u8 height_in_tiles, u8 palette)
 Bg_FillWramTileMapRectWithTileAndPalette: @ 8002804
 	push {r4-r6,lr}
 	sub sp, 0x10
@@ -2863,6 +2902,7 @@ Bg_FillWramTileMapRectWithTileAndPalette: @ 8002804
 	thumb_func_end Bg_FillWramTileMapRectWithTileAndPalette
 
 	thumb_func_start bg_write_sequence_to_wram_tile_map_rect
+@ void bg_write_sequence_to_wram_tile_map_rect(u8 bg_id, s16 first_tile_num, u8 tilemap_x, u8 tilemap_y, u8 width_in_tiles, u8 height_in_tiles, u8 palette, u16 tile_num_inc_amount)
 bg_write_sequence_to_wram_tile_map_rect: @ 8002840
 	push {r4-r7,lr}
 	mov r7, r10
@@ -3078,6 +3118,7 @@ _080029D4:
 	thumb_func_end bg_write_sequence_to_wram_tile_map_rect
 
 	thumb_func_start bg_get_screen_size_in_regular_mode
+@ int bg_get_screen_size_in_regular_mode(u8 bg_id, int mode)
 bg_get_screen_size_in_regular_mode: @ 80029EC
 	push {r4,r5,lr}
 	lsls r0, 24
@@ -3147,6 +3188,7 @@ _08002A54:
 	thumb_func_end bg_get_screen_size_in_regular_mode
 
 	thumb_func_start bg_get_screen_size_in_affine_mode
+@ int bg_get_screen_size_in_affine_mode(u8 bg_id, u8 a2)
 bg_get_screen_size_in_affine_mode: @ 8002A5C
 	push {r4,lr}
 	lsls r0, 24
@@ -3202,6 +3244,7 @@ _08002AAE:
 	thumb_func_end bg_get_screen_size_in_affine_mode
 
 	thumb_func_start bg_get_index_from_tile_coords
+@ int bg_get_index_from_tile_coords(int tilemap_x, int tilemap_y, int screen_size, int tilemap_w, int tilemap_h)
 bg_get_index_from_tile_coords: @ 8002AB4
 	push {r4,lr}
 	adds r4, r0, 0
@@ -3235,6 +3278,7 @@ _08002AE0:
 	thumb_func_end bg_get_index_from_tile_coords
 
 	thumb_func_start bg_copy_tilemap_entry_not_rotscale_mode
+@ void bg_copy_tilemap_entry_not_rotscale_mode(u16 *tile_src, u16 *tile_dest, signed int palette, s16 a4, int a5)
 bg_copy_tilemap_entry_not_rotscale_mode: @ 8002AEC
 	push {r4-r6,lr}
 	adds r4, r0, 0
@@ -3288,6 +3332,7 @@ _08002B3C:
 	thumb_func_end bg_copy_tilemap_entry_not_rotscale_mode
 
 	thumb_func_start bg_get_type_by_bg_id
+@ u16 bg_get_type_by_bg_id(u8 bg_id)
 bg_get_type_by_bg_id: @ 8002B48
 	push {r4,r5,lr}
 	lsls r0, 24
@@ -3339,6 +3384,7 @@ _08002B90:
 	thumb_func_end bg_get_type_by_bg_id
 
 	thumb_func_start is_invalid_bg_id_2
+@ int is_invalid_bg_id_2(u8 bg_id)
 is_invalid_bg_id_2: @ 8002B9C
 	push {lr}
 	lsls r0, 24
@@ -3355,6 +3401,7 @@ _08002BAC:
 	thumb_func_end is_invalid_bg_id_2
 
 	thumb_func_start IsTileMapOutsideWram
+@ bool IsTileMapOutsideWram(u8 bg_id)
 IsTileMapOutsideWram: @ 8002BB0
 	push {lr}
 	lsls r0, 24

asm/gpu_obj.s

@@ -28,6 +28,7 @@ reset_all_obj_data: @ 8006974
 	thumb_func_end reset_all_obj_data
 
 	thumb_func_start call_obj_callbacks
+@ void call_obj_callbacks()
 call_obj_callbacks: @ 80069C0
 	push {r4-r7,lr}
 	movs r6, 0
@@ -69,6 +70,7 @@ _080069F6:
 	thumb_func_end call_obj_callbacks
 
 	thumb_func_start obj_sync_something
+@ void obj_sync_something()
 obj_sync_something: @ 8006A0C
 	push {r4,r5,lr}
 	bl update_obj_oam_coords
@@ -467,6 +469,7 @@ _08006D04:
 	thumb_func_end determine_visible_sprites_maybe
 
 	thumb_func_start copy_rotscale_coeffs_to_super_sprites
+@ void copy_rotscale_coeffs_to_super_sprites()
 copy_rotscale_coeffs_to_super_sprites: @ 8006D1C
 	push {r4-r6,lr}
 	movs r4, 0
@@ -508,6 +511,7 @@ _08006D24:
 	thumb_func_end copy_rotscale_coeffs_to_super_sprites
 
 	thumb_func_start super_sprites_fill
+@ void super_sprites_fill()
 super_sprites_fill: @ 8006D68
 	push {r4-r6,lr}
 	sub sp, 0x4
@@ -577,6 +581,7 @@ _08006DD8:
 	thumb_func_end super_sprites_fill
 
 	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
 	push {r4-r7,lr}
 	sub sp, 0x4
@@ -624,6 +629,7 @@ _08006E40:
 	thumb_func_end obj_add_from_template_forward_search
 
 	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
 	push {r4-r7,lr}
 	mov r7, r8
@@ -682,6 +688,7 @@ _08006EA6:
 	thumb_func_end obj_add_from_template_backward_search
 
 	thumb_func_start obj_add_empty_with_callback
+@ int obj_add_empty_with_callback(void ( *func)())
 obj_add_empty_with_callback: @ 8006EB4
 	push {r4-r6,lr}
 	adds r6, r0, 0
@@ -720,6 +727,7 @@ _08006EF6:
 	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
 	push {r4-r7,lr}
 	mov r7, r10
@@ -889,6 +897,7 @@ _08007040:
 	thumb_func_end template_read
 
 	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
 	push {r4-r7,lr}
 	mov r7, r10
@@ -967,6 +976,7 @@ _080070D8:
 	thumb_func_end obj_add_from_template_call_callback_once
 
 	thumb_func_start obj_delete_and_free_tiles
+@ void obj_delete_and_free_tiles(struct obj *obj)
 obj_delete_and_free_tiles: @ 80070E8
 	push {r4-r7,lr}
 	adds r5, r0, 0
@@ -1024,6 +1034,7 @@ _08007144:
 	thumb_func_end obj_delete_and_free_tiles
 
 	thumb_func_start reset_super_sprites
+@ void reset_super_sprites(u8 a1, u8 a2)
 reset_super_sprites: @ 8007150
 	push {r4-r6,lr}
 	lsls r0, 24
@@ -1055,6 +1066,7 @@ _08007178:
 	thumb_func_end reset_super_sprites
 
 	thumb_func_start copy_super_sprites_to_oam
+@ void copy_super_sprites_to_oam()
 copy_super_sprites_to_oam: @ 8007188
 	push {lr}
 	ldr r2, =0x030022c0
@@ -1158,6 +1170,7 @@ rotscale_set_direct: @ 8007224
 	thumb_func_end rotscale_set_direct
 
 	thumb_func_start obj_delete
+@ void obj_delete(struct obj *obj)
 obj_delete: @ 8007244
 	push {lr}
 	ldr r1, =0x082ec64c
@@ -1208,6 +1221,7 @@ _08007286:
 	thumb_func_end oam_center
 
 	thumb_func_start gpu_tile_obj_alloc
+@ int gpu_tile_obj_alloc(u16 tile_count)
 gpu_tile_obj_alloc: @ 800729C
 	push {r4-r7,lr}
 	mov r7, r9
@@ -1360,6 +1374,7 @@ _080073A4:
 	thumb_func_end gpu_tile_obj_alloc
 
 	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
 	push {r4-r6,lr}
 	lsls r0, 16
@@ -1427,6 +1442,7 @@ nullsub_12: @ 8007428
 	thumb_func_end nullsub_12
 
 	thumb_func_start copy_queue_process
+@ void copy_queue_process()
 copy_queue_process: @ 800742C
 	push {r4-r7,lr}
 	ldr r0, =0x02021834
@@ -1524,6 +1540,7 @@ _080074D8:
 	thumb_func_end copy_queue_add_oam_frame
 
 	thumb_func_start copy_queue_add
+@ void copy_queue_add(void *src, void *dest, u16 len)
 copy_queue_add: @ 80074EC
 	push {r4-r6,lr}
 	adds r4, r0, 0
@@ -1566,6 +1583,7 @@ _0800752C:
 	thumb_func_end copy_queue_add
 
 	thumb_func_start copy_all_from_objects
+@ void copy_all_from_objects(void *dest)
 copy_all_from_objects: @ 800753C
 	push {r4,lr}
 	adds r1, r0, 0
@@ -1588,6 +1606,7 @@ _08007546:
 	thumb_func_end copy_all_from_objects
 
 	thumb_func_start copy_all_to_objects
+@ void copy_all_to_objects(void *src)
 copy_all_to_objects: @ 8007564
 	push {r4,lr}
 	adds r1, r0, 0
@@ -1610,6 +1629,7 @@ _0800756E:
 	thumb_func_end copy_all_to_objects
 
 	thumb_func_start obj_delete_all
+@ void obj_delete_all()
 obj_delete_all: @ 800758C
 	push {r4,r5,lr}
 	movs r4, 0
@@ -1641,6 +1661,7 @@ _08007590:
 	thumb_func_end obj_delete_all
 
 	thumb_func_start obj_free_tiles
+@ void obj_free_tiles(struct obj *obj)
 obj_free_tiles: @ 80075C8
 	push {lr}
 	ldr r2, [r0, 0x14]
@@ -1658,6 +1679,7 @@ _080075DA:
 	thumb_func_end obj_free_tiles
 
 	thumb_func_start obj_free_pal
+@ void obj_free_pal(struct obj *obj)
 obj_free_pal: @ 80075E4
 	push {lr}
 	ldr r0, [r0, 0x14]
@@ -1668,6 +1690,7 @@ obj_free_pal: @ 80075E4
 	thumb_func_end obj_free_pal
 
 	thumb_func_start obj_free_rotscale_entry
+@ void obj_free_rotscale_entry(struct obj *obj)
 obj_free_rotscale_entry: @ 80075F4
 	push {r4,lr}
 	adds r4, r0, 0
@@ -1694,6 +1717,7 @@ _0800761A:
 	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
 	push {r4,lr}
 	adds r4, r0, 0
@@ -1710,6 +1734,7 @@ obj_delete_and_free_resources: @ 8007620
 	thumb_func_end obj_delete_and_free_resources
 
 	thumb_func_start obj_anim_step
+@ void obj_anim_step(struct obj *obj)
 obj_anim_step: @ 8007640
 	push {r4,r5,lr}
 	adds r4, r0, 0
@@ -1745,6 +1770,7 @@ _08007676:
 	thumb_func_end obj_anim_step
 
 	thumb_func_start obj_anim_image_begin
+@ void obj_anim_image_begin(struct obj *obj)
 obj_anim_image_begin: @ 8007688
 	push {r4-r7,lr}
 	mov r7, r9
@@ -1868,6 +1894,7 @@ _0800776C:
 	thumb_func_end obj_anim_image_begin
 
 	thumb_func_start obj_anim_image_continue
+@ void obj_anim_image_continue(struct obj *obj)
 obj_anim_image_continue: @ 8007778
 	push {r4,lr}
 	adds r4, r0, 0
@@ -1952,6 +1979,7 @@ _0800780E:
 	thumb_func_end obj_anim_image_continue
 
 	thumb_func_start anim_image_3
+@ void anim_image_3(struct obj *obj)
 anim_image_3: @ 8007818
 	push {r4-r7,lr}
 	mov r7, r8
@@ -2042,6 +2070,7 @@ _080078BA:
 	thumb_func_end anim_image_3
 
 	thumb_func_start anim_image_2
+@ void anim_image_2(struct obj *obj)
 anim_image_2: @ 80078C4
 	adds r2, r0, 0
 	adds r2, 0x2B
@@ -2057,6 +2086,7 @@ anim_image_2: @ 80078C4
 	thumb_func_end anim_image_2
 
 	thumb_func_start anim_image_1
+@ void anim_image_1(struct obj *obj)
 anim_image_1: @ 80078DC
 	push {r4-r7,lr}
 	mov r7, r8
@@ -2160,6 +2190,7 @@ _0800799A:
 	thumb_func_end anim_image_1
 
 	thumb_func_start anim_image_0
+@ void anim_image_0(struct obj *obj)
 anim_image_0: @ 80079A4
 	push {lr}
 	adds r1, r0, 0
@@ -2179,6 +2210,7 @@ _080079BE:
 	thumb_func_end anim_image_0
 
 	thumb_func_start sub_80079C4
+@ void sub_80079C4(struct obj *obj)
 sub_80079C4: @ 80079C4
 	push {r4,lr}
 	adds r4, r0, 0
@@ -2209,6 +2241,7 @@ sub_80079C4: @ 80079C4
 	thumb_func_end sub_80079C4
 
 	thumb_func_start sub_80079FC
+@ void sub_80079FC(struct obj *obj)
 sub_80079FC: @ 80079FC
 	push {r4,lr}
 	adds r4, r0, 0
@@ -2227,6 +2260,7 @@ sub_80079FC: @ 80079FC
 	thumb_func_end sub_80079FC
 
 	thumb_func_start obj_anim_rewind_to_cmd00
+@ void obj_anim_rewind_to_cmd00(struct obj *obj)
 obj_anim_rewind_to_cmd00: @ 8007A1C
 	push {r4-r7,lr}
 	mov r12, r0
@@ -2726,6 +2760,7 @@ anim_rotscale_3: @ 8007DA0
 	thumb_func_end anim_rotscale_3
 
 	thumb_func_start rotscale_set_indirect
+@ void rotscale_set_indirect(u8 rotscale_entry_index, s16 rotscale_data[])
 rotscale_set_indirect: @ 8007DD8
 	lsls r0, 24
 	ldr r2, =0x02021bc0
@@ -2745,6 +2780,7 @@ rotscale_set_indirect: @ 8007DD8
 	thumb_func_end rotscale_set_indirect
 
 	thumb_func_start obj_get_rotscale_entry_index
+@ int obj_get_rotscale_entry_index(struct obj *obj)
 obj_get_rotscale_entry_index: @ 8007DF8
 	push {lr}
 	adds r2, r0, 0
@@ -2766,6 +2802,7 @@ _08007E12:
 	thumb_func_end obj_get_rotscale_entry_index
 
 	thumb_func_start sub_8007E18
+@ void sub_8007E18(struct obj *obj, s16 a2, s16 a3)
 sub_8007E18: @ 8007E18
 	strh r1, [r0, 0x3A]
 	strh r2, [r0, 0x3C]
@@ -2778,6 +2815,7 @@ sub_8007E18: @ 8007E18
 	thumb_func_end sub_8007E18
 
 	thumb_func_start sub_8007E28
+@ int sub_8007E28(int a1, int a2, int a3)
 sub_8007E28: @ 8007E28
 	push {r4,r5,lr}
 	adds r3, r0, 0
@@ -2804,6 +2842,7 @@ _08007E3E:
 	thumb_func_end sub_8007E28
 
 	thumb_func_start obj_update_pos2
+@ void obj_update_pos2(struct obj *obj, int a2, int a3)
 obj_update_pos2: @ 8007E54
 	push {r4-r7,lr}
 	mov r7, r9
@@ -2881,6 +2920,7 @@ _08007EDA:
 	thumb_func_end obj_update_pos2
 
 	thumb_func_start obj_set_horizonal_and_vertical_flip
+@ void obj_set_horizonal_and_vertical_flip(struct obj *obj, u8 a2, char a3)
 obj_set_horizonal_and_vertical_flip: @ 8007EF0
 	push {r4-r6,lr}
 	mov r6, r8
@@ -2942,6 +2982,7 @@ obj_set_horizonal_and_vertical_flip: @ 8007EF0
 	thumb_func_end obj_set_horizonal_and_vertical_flip
 
 	thumb_func_start rotscale_reset_half
+@ void rotscale_reset_half(u8 index)
 rotscale_reset_half: @ 8007F64
 	lsls r0, 24
 	lsrs r0, 24
@@ -2960,6 +3001,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)
 rotscale_reset_full_1: @ 8007F80
 	lsls r0, 24
 	lsrs r0, 24
@@ -2984,6 +3026,7 @@ rotscale_reset_full_1: @ 8007F80
 	thumb_func_end rotscale_reset_full_1
 
 	thumb_func_start rotscale_reset_full_2
+@ void rotscale_reset_full_2(u8 index)
 rotscale_reset_full_2: @ 8007FA8
 	lsls r0, 24
 	lsrs r0, 24
@@ -3008,6 +3051,7 @@ rotscale_reset_full_2: @ 8007FA8
 	thumb_func_end rotscale_reset_full_2
 
 	thumb_func_start rotscale_frame_apply_absolute
+@ void rotscale_frame_apply_absolute(u8 index, int a2)
 rotscale_frame_apply_absolute: @ 8007FD0
 	lsls r0, 24
 	lsrs r0, 24
@@ -3083,6 +3127,7 @@ _08008040:
 	thumb_func_end obj_anim_rotscale_delay_progress
 
 	thumb_func_start rotscale_frame_apply_relative_and_sync
+@ void rotscale_frame_apply_relative_and_sync(u8 index, int a2)
 rotscale_frame_apply_relative_and_sync: @ 800804C
 	push {r4-r6,lr}
 	sub sp, 0x10
@@ -3152,6 +3197,7 @@ rotscale_frame_apply_relative_and_sync: @ 800804C
 	thumb_func_end rotscale_frame_apply_relative_and_sync
 
 	thumb_func_start divide_0x10000_by
+@ int divide_0x10000_by(int n)
 divide_0x10000_by: @ 80080E4
 	push {lr}
 	adds r1, r0, 0
@@ -3167,6 +3213,7 @@ divide_0x10000_by: @ 80080E4
 	thumb_func_end divide_0x10000_by
 
 	thumb_func_start rotscale_load_frame
+@ void rotscale_load_frame(u8 index, int a2, int a3)
 rotscale_load_frame: @ 80080FC
 	push {r4,lr}
 	lsls r0, 24
@@ -3514,6 +3561,7 @@ _08008370:
 	thumb_func_end sub_8008324
 
 	thumb_func_start rotscale_reset_all
+@ void rotscale_reset_all()
 rotscale_reset_all: @ 800837C
 	push {r4,lr}
 	ldr r1, =0x02021cc0
@@ -3540,6 +3588,7 @@ _08008390:
 	thumb_func_end rotscale_reset_all
 
 	thumb_func_start rotscale_alloc_entry
+@ u8 rotscale_alloc_entry()
 rotscale_alloc_entry: @ 80083B0
 	push {r4,lr}
 	movs r2, 0
@@ -3574,6 +3623,7 @@ _080083E2:
 	thumb_func_end rotscale_alloc_entry
 
 	thumb_func_start rotscale_free_entry
+@ void rotscale_free_entry(u8 rotscale_index)
 rotscale_free_entry: @ 80083E8
 	push {lr}
 	sub sp, 0x4
@@ -3610,6 +3660,7 @@ _08008406:
 	thumb_func_end rotscale_free_entry
 
 	thumb_func_start obj_alloc_rotscale_entry
+@ void obj_alloc_rotscale_entry(struct obj *obj)
 obj_alloc_rotscale_entry: @ 8008428
 	push {r4,r5,lr}
 	adds r4, r0, 0
@@ -3713,6 +3764,7 @@ sub_8008478: @ 8008478
 	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 rom_obj_tile_data *x)
 gpu_tile_obj_alloc_tag_and_copy_to_vram: @ 80084F8
 	push {r4-r6,lr}
 	adds r5, r0, 0
@@ -3749,6 +3801,7 @@ _08008536:
 	thumb_func_end gpu_tile_obj_alloc_tag_and_copy_to_vram
 
 	thumb_func_start gpu_tile_obj_alloc_and_load_multiple
+@ void gpu_tile_obj_alloc_and_load_multiple(struct rom_obj_tile_data[])
 gpu_tile_obj_alloc_and_load_multiple: @ 800853C
 	push {r4,r5,lr}
 	adds r5, r0, 0
@@ -3775,6 +3828,7 @@ _08008560:
 	thumb_func_end gpu_tile_obj_alloc_and_load_multiple
 
 	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
 	push {r4-r7,lr}
 	mov r7, r8
@@ -3835,6 +3889,7 @@ _080085C6:
 	thumb_func_end gpu_tile_obj_free_by_tag
 
 	thumb_func_start gpu_tile_obj_tags_reset
+@ void gpu_tile_obj_tags_reset()
 gpu_tile_obj_tags_reset: @ 80085E0
 	push {r4-r7,lr}
 	movs r2, 0
@@ -3868,6 +3923,7 @@ _080085F0:
 	thumb_func_end gpu_tile_obj_tags_reset
 
 	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
 	push {lr}
 	lsls r0, 16
@@ -3962,6 +4018,7 @@ _080086B8:
 	thumb_func_end gpu_tile_obj_tag_get_by_range_start
 
 	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
 	push {r4-r6,lr}
 	adds r4, r0, 0
@@ -4024,6 +4081,7 @@ _0800871C:
 	thumb_func_end gpu_pal_allocator_reset
 
 	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
 	push {r4,r5,lr}
 	adds r5, r0, 0
@@ -4091,6 +4149,7 @@ _080087B6:
 	thumb_func_end gpu_pal_obj_alloc_and_load_multiple
 
 	thumb_func_start gpu_pal_obj_load
+@ void gpu_pal_obj_load(palette *pal, u16 offset)
 gpu_pal_obj_load: @ 80087BC
 	push {lr}
 	lsls r1, 16
@@ -4105,6 +4164,7 @@ gpu_pal_obj_load: @ 80087BC
 	thumb_func_end gpu_pal_obj_load
 
 	thumb_func_start gpu_pal_alloc_new
+@ int gpu_pal_alloc_new(u16 tag)
 gpu_pal_alloc_new: @ 80087D4
 	push {r4,lr}
 	lsls r0, 16
@@ -4132,6 +4192,7 @@ _080087FE:
 	thumb_func_end gpu_pal_alloc_new
 
 	thumb_func_start gpu_pal_tags_index_of
+@ int gpu_pal_tags_index_of(u16 a1)
 gpu_pal_tags_index_of: @ 8008804
 	push {lr}
 	lsls r0, 16
@@ -4177,6 +4238,7 @@ gpu_pal_tag_by_index: @ 800883C
 	thumb_func_end gpu_pal_tag_by_index
 
 	thumb_func_start gpu_pal_free_tag
+@ void gpu_pal_free_tag(int tag)
 gpu_pal_free_tag: @ 800884C
 	push {lr}
 	lsls r0, 16
@@ -4199,6 +4261,7 @@ _08008868:
 	thumb_func_end gpu_pal_free_tag
 
 	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
 	str r1, [r0, 0x18]
 	adds r0, 0x42
@@ -4208,6 +4271,7 @@ obj_set_f18_to_r0_f42_to_40: @ 8008874
 	thumb_func_end obj_set_f18_to_r0_f42_to_40
 
 	thumb_func_start super_sprite_add
+@ int super_sprite_add(struct obj *obj, u8 *index)
 super_sprite_add: @ 8008880
 	push {r4,lr}
 	adds r4, r0, 0
@@ -4268,6 +4332,7 @@ _080088E0:
 	thumb_func_end super_sprite_add
 
 	thumb_func_start sub_80088EC
+@ int sub_80088EC(struct obj *obj, int a2, int a3)
 sub_80088EC: @ 80088EC
 	push {r4-r7,lr}
 	mov r7, r10

asm/gpu_reg_manager.s

@@ -1,4 +1,5 @@
 	thumb_func_start lcd_io_copy_queue_clean
+@ void lcd_io_copy_queue_clean()
 lcd_io_copy_queue_clean: @ 8000FE4
 	push {r4-r7,lr}
 	mov r7, r8
@@ -40,6 +41,7 @@ _08000FFE:
 	thumb_func_end lcd_io_copy_queue_clean
 
 	thumb_func_start lcd_io_buffer_to_hardware
+@ void lcd_io_buffer_to_hardware(u8 reg)
 lcd_io_buffer_to_hardware: @ 800103C
 	push {lr}
 	lsls r0, 24
@@ -75,6 +77,7 @@ _08001076:
 	thumb_func_end lcd_io_buffer_to_hardware
 
 	thumb_func_start lcd_io_copy_queue_process
+@ void lcd_io_copy_queue_process()
 lcd_io_copy_queue_process: @ 8001080
 	push {r4,r5,lr}
 	ldr r0, =0x030008d8
@@ -103,6 +106,7 @@ _080010A4:
 	thumb_func_end lcd_io_copy_queue_process
 
 	thumb_func_start lcd_io_set
+@ void lcd_io_set(u8 reg, u16 value)
 lcd_io_set: @ 80010B4
 	push {r4,r5,lr}
 	lsls r0, 24
@@ -177,6 +181,7 @@ _08001130:
 	thumb_func_end lcd_io_set
 
 	thumb_func_start lcd_io_set_forced_blank
+@ void lcd_io_set_forced_blank(u8 reg, u16 value)
 lcd_io_set_forced_blank: @ 8001140
 	push {r4,r5,lr}
 	lsls r0, 24
@@ -241,6 +246,7 @@ _080011A8:
 	thumb_func_end lcd_io_set_forced_blank
 
 	thumb_func_start lcd_io_get
+@ u16 lcd_io_get(u8 reg)
 lcd_io_get: @ 80011B8
 	push {lr}
 	lsls r0, 24
@@ -273,6 +279,7 @@ _080011E0:
 	thumb_func_end lcd_io_get
 
 	thumb_func_start lcd_io_set_bits
+@ void lcd_io_set_bits(u8 reg, u16 mask)
 lcd_io_set_bits: @ 80011E8
 	push {lr}
 	adds r2, r1, 0
@@ -292,6 +299,7 @@ lcd_io_set_bits: @ 80011E8
 	thumb_func_end lcd_io_set_bits
 
 	thumb_func_start lcd_io_clear_bits
+@ void lcd_io_clear_bits(u8 reg, u16 mask)
 lcd_io_clear_bits: @ 8001208
 	push {lr}
 	adds r2, r1, 0
@@ -311,6 +319,7 @@ lcd_io_clear_bits: @ 8001208
 	thumb_func_end lcd_io_clear_bits
 
 	thumb_func_start update_hardware_IE
+@ void update_hardware_IE()
 update_hardware_IE: @ 8001228
 	push {r4,r5,lr}
 	ldr r5, =0x030008d9
@@ -336,6 +345,7 @@ _08001246:
 	thumb_func_end update_hardware_IE
 
 	thumb_func_start enable_irqs
+@ void enable_irqs(u16 value)
 enable_irqs: @ 800125C
 	push {r4,lr}
 	lsls r0, 16
@@ -358,6 +368,7 @@ enable_irqs: @ 800125C
 	thumb_func_end enable_irqs
 
 	thumb_func_start disable_irqs
+@ void disable_irqs(u16 value)
 disable_irqs: @ 8001288
 	push {r4,lr}
 	lsls r0, 16
@@ -380,6 +391,7 @@ disable_irqs: @ 8001288
 	thumb_func_end disable_irqs
 
 	thumb_func_start dispstat_set_vblank_hblank_irqs
+@ void dispstat_set_vblank_hblank_irqs(u16 value)
 dispstat_set_vblank_hblank_irqs: @ 80012B4
 	push {r4,lr}
 	adds r4, r0, 0

asm/libagbbackup.s

@@ -20,6 +20,7 @@ _082E187C: .4byte 0x0e002aaa
 	thumb_func_end SwitchFlashBank
 
 	thumb_func_start ReadFlashID
+@ u16 ReadFlashID()
 ReadFlashID: @ 82E1880
 	push {r4,r5,lr}
 	sub sp, 0x44
@@ -95,6 +96,7 @@ _082E1908:
 	thumb_func_end ReadFlashID
 
 	thumb_func_start FlashTimerIntr
+@ void FlashTimerIntr()
 FlashTimerIntr: @ 82E191C
 	push {lr}
 	ldr r1, _082E193C
@@ -119,6 +121,7 @@ _082E1940: .4byte 0x03007840
 	thumb_func_end FlashTimerIntr
 
 	thumb_func_start SetFlashTimerIntr
+@ void SetFlashTimerIntr(u8 timer_id, void ( **irq_timer_func)())
 SetFlashTimerIntr: @ 82E1944
 	push {lr}
 	adds r2, r1, 0
@@ -263,12 +266,14 @@ _082E1A68: .4byte 0x03001a78
 	thumb_func_end StopFlashTimer
 
 	thumb_func_start ReadFlash1
+@ u8 ReadFlash1(int address)
 ReadFlash1: @ 82E1A6C
 	ldrb r0, [r0]
 	bx lr
 	thumb_func_end ReadFlash1
 
 	thumb_func_start SetReadFlash1
+@ void SetReadFlash1(u8 ( *target_func)(int address))
 SetReadFlash1: @ 82E1A70
 	push {lr}
 	adds r2, r0, 0
@@ -666,6 +671,7 @@ _082E1D58: .4byte 0x0300784c
 	thumb_func_end ProgramFlashSectorsVerifyFirstNBytes
 
 	thumb_func_start IdentifyFlash
+@ _BOOL2 IdentifyFlash()
 IdentifyFlash: @ 82E1D5C
 	push {r4,lr}
 	ldr r2, _082E1D7C

asm/libagbsyscall.s

@@ -5,18 +5,21 @@ ArcTan2: @ 82E7078
 	thumb_func_end ArcTan2
 
 	thumb_func_start BgAffineSet
+@ void BgAffineSet(BgAffineSet_src_data *src, BgAffineSet_dest_data *dest, int entry_count)
 BgAffineSet: @ 82E707C
 	swi 0xE
 	bx lr
 	thumb_func_end BgAffineSet
 
 	thumb_func_start CpuFastSet
+@ void CpuFastSet(void *src, void *dest, unsigned int mode)
 CpuFastSet: @ 82E7080
 	swi 0xC
 	bx lr
 	thumb_func_end CpuFastSet
 
 	thumb_func_start CpuSet
+@ void CpuSet(void *src, void *dest, unsigned int mode)
 CpuSet: @ 82E7084
 	swi 0xB
 	bx lr
@@ -29,12 +32,14 @@ Div: @ 82E7088
 	thumb_func_end Div
 
 	thumb_func_start LZ77UnCompVram
+@ void LZ77UnCompVram(void *src, void *dest)
 LZ77UnCompVram: @ 82E708C
 	swi 0x12
 	bx lr
 	thumb_func_end LZ77UnCompVram
 
 	thumb_func_start LZ77UnCompWram
+@ void LZ77UnCompWram(void *src, void *dest)
 LZ77UnCompWram: @ 82E7090
 	swi 0x11
 	bx lr
@@ -67,12 +72,14 @@ RLUnCompWram: @ 82E70A4
 	thumb_func_end RLUnCompWram
 
 	thumb_func_start RegisterRamReset
+@ void RegisterRamReset(int ResetFlags)
 RegisterRamReset: @ 82E70A8
 	swi 0x1
 	bx lr
 	thumb_func_end RegisterRamReset
 
 	thumb_func_start SoftReset
+@ void SoftReset()
 SoftReset: @ 82E70AC
 	ldr r3, _082E70BC
 	movs r2, 0
@@ -87,12 +94,14 @@ _082E70C0: .4byte 0x03007f00
 	thumb_func_end SoftReset
 
 	thumb_func_start Sqrt
+@ s16 Sqrt(int)
 Sqrt: @ 82E70C4
 	swi 0x8
 	bx lr
 	thumb_func_end Sqrt
 
 	thumb_func_start VBlankIntrWait
+@ void VBlankIntrWait()
 VBlankIntrWait: @ 82E70C8
 	movs r2, 0
 	swi 0x5

asm/libgcc.s

@@ -11,6 +11,7 @@ _call_via_r1: @ 82E70D4
 	thumb_func_end _call_via_r1
 
 	thumb_func_start _call_via_r2
+@ void __usercall_call_via_r2(void ( *func)()<R2>)
 _call_via_r2: @ 82E70D8
 	bx r2
 	mov r8, r8
@@ -29,6 +30,7 @@ _call_via_r4: @ 82E70E0
 	thumb_func_end _call_via_r4
 
 	thumb_func_start _call_via_r5
+@ void __usercall_call_via_r5(void ( *func)()<R5>)
 _call_via_r5: @ 82E70E4
 	bx r5
 	mov r8, r8
@@ -643,6 +645,7 @@ _082E753C: .4byte 0x0000ffff
 	thumb_func_end __divdi3
 
 	thumb_func_start __divsi3
+@ int __divsi3(int dividend, int divisor)
 __divsi3: @ 82E7540
 	cmp r1, 0
 	beq _082E75C8
@@ -1484,6 +1487,7 @@ _082E7B64: .4byte 0x0000ffff
 	thumb_func_end __udivdi3
 
 	thumb_func_start __udivsi3
+@ unsigned int __udivsi3(unsigned int dividend, unsigned int divisor)
 __udivsi3: @ 82E7B68
 	cmp r1, 0
 	beq _082E7BD6
@@ -1557,6 +1561,7 @@ _082E7BD6:
 	thumb_func_end __udivsi3
 
 	thumb_func_start __umodsi3
+@ unsigned int __umodsi3(unsigned int dividend, unsigned int divisor)
 __umodsi3: @ 82E7BE0
 	cmp r1, 0
 	beq _082E7C96
@@ -2302,6 +2307,7 @@ _082E8128: .4byte 0x1fffffff
 	thumb_func_end __fpadd_parts_d
 
 	thumb_func_start __adddf3
+@ double __adddf3(double arg_a, double arg_b)
 __adddf3: @ 82E812C
 	push {r4,lr}
 	sub sp, 0x4C
@@ -3242,6 +3248,7 @@ _082E87D0:
 	thumb_func_end __gtdf2
 
 	thumb_func_start __gedf2
+@ int __gedf2(double arg_a, double arg_b)
 __gedf2: @ 82E87D4
 	push {r4,lr}
 	sub sp, 0x38
@@ -3442,6 +3449,7 @@ _082E8930: .4byte 0x0fffffff
 	thumb_func_end __floatsidf
 
 	thumb_func_start __fixdfsi
+@ int __fixdfsi(double arg_a)
 __fixdfsi: @ 82E8934
 	push {lr}
 	sub sp, 0x1C
@@ -5018,6 +5026,7 @@ _082E93CA:
 	thumb_func_end __negdi2
 
 	thumb_func_start memcpy
+@ void *memcpy(void *dest, void *src, int size)
 memcpy: @ 82E93D4
 	push {r4,r5,lr}
 	adds r5, r0, 0
@@ -5075,6 +5084,7 @@ _082E942E:
 	thumb_func_end memcpy
 
 	thumb_func_start memset
+@ void *memset(void *dest, char c, int size)
 memset: @ 82E9434
 	push {r4,r5,lr}
 	adds r5, r0, 0
@@ -5125,6 +5135,7 @@ _082E947A:
 	thumb_func_end memset
 
 	thumb_func_start strcmp
+@ int strcmp(char *s1, char *s2)
 strcmp: @ 82E9488
 	push {r4,r5,lr}
 	adds r2, r0, 0

asm/libmks4agb.s

@@ -1959,6 +1959,7 @@ _082E004C: .4byte 0x7fffffff
 	thumb_func_end MPlayContinue
 
 	thumb_func_start MPlayFadeOut
+@ void MPlayFadeOut(mplay_table_entry *a1, s16 a2)
 MPlayFadeOut: @ 82E0050
 	adds r2, r0, 0
 	lsls r1, 16
@@ -2310,6 +2311,7 @@ _082E02F4: .4byte 0x030073a0
 	thumb_func_end m4aMPlayAllContinue
 
 	thumb_func_start m4aMPlayFadeOut
+@ void m4aMPlayFadeOut(mplay_table_entry *a1, u16 a2)
 m4aMPlayFadeOut: @ 82E02F8
 	push {lr}
 	lsls r1, 16
@@ -2406,6 +2408,7 @@ _082E0392:
 	thumb_func_end m4aMPlayImmInit
 
 	thumb_func_start MPlayExtender
+@ int MPlayExtender(void *dest)
 MPlayExtender: @ 82E0398
 	push {r4-r6,lr}
 	sub sp, 0x4
@@ -2561,6 +2564,7 @@ _082E04D8: .4byte 0x030074ec
 	thumb_func_end Clear64byte_rev
 
 	thumb_func_start SoundInit_rev01
+@ int SoundInit_rev01(void *dest)
 SoundInit_rev01: @ 82E04DC
 	push {r4,r5,lr}
 	sub sp, 0x4

asm/main.s

@@ -24,7 +24,7 @@ Main:
 	bl flash_timeout_start_on_timer_2_when_flash_present
 	bl init_saveblock_ptrs_and_set_copyright_callback2
 	bl sound_sources_off
-	bl dma3_transfer_queue_clear
+	bl ClearDma3Requests
 	bl gpu_init_bgs
 	bl fboxes_set_default_ptr
 	ldr r0, =0x02000000
@@ -107,6 +107,7 @@ _080004B2:
 	thumb_func_end Main
 
 	thumb_func_start call_callbacks_wrapper
+@ void call_callbacks_wrapper()
 call_callbacks_wrapper: @ 80004C4
 	push {lr}
 	bl sub_800B40C
@@ -120,6 +121,7 @@ _080004D4:
 	thumb_func_end call_callbacks_wrapper
 
 	thumb_func_start init_saveblock_ptrs_and_set_copyright_callback2
+@ void init_saveblock_ptrs_and_set_copyright_callback2()
 init_saveblock_ptrs_and_set_copyright_callback2: @ 80004D8
 	push {lr}
 	ldr r2, =0x030022c0
@@ -144,6 +146,7 @@ init_saveblock_ptrs_and_set_copyright_callback2: @ 80004D8
 	thumb_func_end init_saveblock_ptrs_and_set_copyright_callback2
 
 	thumb_func_start call_callbacks
+@ void call_callbacks()
 call_callbacks: @ 800051C
 	push {r4,lr}
 	ldr r4, =0x030022c0
@@ -165,6 +168,7 @@ _08000534:
 	thumb_func_end call_callbacks
 
 	thumb_func_start set_callback2
+@ void set_callback2(void ( *func)())
 set_callback2: @ 8000540
 	ldr r1, =0x030022c0
 	str r0, [r1, 0x4]
@@ -179,6 +183,7 @@ set_callback2: @ 8000540
 	thumb_func_end set_callback2
 
 	thumb_func_start start_timer1
+@ void start_timer1()
 start_timer1: @ 8000554
 	ldr r1, =0x04000106
 	movs r0, 0x80
@@ -189,6 +194,7 @@ start_timer1: @ 8000554
 	thumb_func_end start_timer1
 
 	thumb_func_start set_rand_seed_and_trainer_id_hi
+@ void set_rand_seed_and_trainer_id_hi()
 set_rand_seed_and_trainer_id_hi: @ 8000560
 	push {r4,lr}
 	ldr r0, =0x04000104
@@ -208,6 +214,7 @@ set_rand_seed_and_trainer_id_hi: @ 8000560
 	thumb_func_end set_rand_seed_and_trainer_id_hi
 
 	thumb_func_start get_trainer_id_hi
+@ u16 get_trainer_id_hi()
 get_trainer_id_hi: @ 8000588
 	ldr r0, =0x02020000
 	ldrh r0, [r0]
@@ -217,6 +224,7 @@ get_trainer_id_hi: @ 8000588
 	thumb_func_end get_trainer_id_hi
 
 	thumb_func_start lcd_enable_vcount_irq_at_150px
+@ void lcd_enable_vcount_irq_at_150px()
 lcd_enable_vcount_irq_at_150px: @ 8000594
 	push {lr}
 	movs r0, 0x4
@@ -238,6 +246,7 @@ lcd_enable_vcount_irq_at_150px: @ 8000594
 	thumb_func_end lcd_enable_vcount_irq_at_150px
 
 	thumb_func_start init_keypad_data
+@ void init_keypad_data()
 init_keypad_data: @ 80005BC
 	ldr r1, =0x030026fc
 	movs r0, 0x5
@@ -258,6 +267,7 @@ init_keypad_data: @ 80005BC
 	thumb_func_end init_keypad_data
 
 	thumb_func_start load_keys
+@ void load_keys()
 load_keys: @ 80005E4
 	push {lr}
 	ldr r0, =0x04000130
@@ -338,6 +348,7 @@ _08000676:
 	thumb_func_end load_keys
 
 	thumb_func_start init_irq_handler
+@ void init_irq_handler()
 init_irq_handler: @ 8000684
 	push {r4,r5,lr}
 	ldr r5, =InterruptMain
@@ -378,6 +389,7 @@ _08000690:
 	thumb_func_end init_irq_handler
 
 	thumb_func_start SetVBlankCallback
+@ void SetVBlankCallback(void ( *func)())
 SetVBlankCallback: @ 80006F0
 	ldr r1, =0x030022c0
 	str r0, [r1, 0xC]
@@ -387,6 +399,7 @@ SetVBlankCallback: @ 80006F0
 	thumb_func_end SetVBlankCallback
 
 	thumb_func_start SetHBlankCallback
+@ void SetHBlankCallback(void ( *func)())
 SetHBlankCallback: @ 80006FC
 	ldr r1, =0x030022c0
 	str r0, [r1, 0x10]
@@ -405,6 +418,7 @@ SetVCountCallback: @ 8000708
 	thumb_func_end SetVCountCallback
 
 	thumb_func_start restore_serial_timer3_irq_handlers
+@ void restore_serial_timer3_irq_handlers()
 restore_serial_timer3_irq_handlers: @ 8000714
 	ldr r0, =0x03002710
 	ldr r1, =irq_serial + 1
@@ -417,6 +431,7 @@ restore_serial_timer3_irq_handlers: @ 8000714
 	thumb_func_end restore_serial_timer3_irq_handlers
 
 	thumb_func_start set_serial_callback
+@ void set_serial_callback(void ( *func)())
 set_serial_callback: @ 800072C
 	ldr r1, =0x030022c0
 	str r0, [r1, 0x18]
@@ -426,6 +441,7 @@ set_serial_callback: @ 800072C
 	thumb_func_end set_serial_callback
 
 	thumb_func_start irq_vblank
+@ void irq_vblank()
 irq_vblank: @ 8000738
 	push {r4,lr}
 	ldr r0, =0x030030fc
@@ -469,7 +485,7 @@ _08000782:
 	adds r0, 0x1
 	str r0, [r4, 0x24]
 	bl lcd_io_copy_queue_process
-	bl dma_transfer_queue_process
+	bl ProcessDma3Requests
 	ldr r1, =0x03002f50
 	ldr r0, =0x03006380
 	ldrb r0, [r0, 0x4]
@@ -511,6 +527,7 @@ _080007BE:
 	thumb_func_end irq_vblank
 
 	thumb_func_start flash_timeout_start_on_timer_2
+@ void flash_timeout_start_on_timer_2()
 flash_timeout_start_on_timer_2: @ 8000800
 	push {lr}
 	ldr r1, =0x0300272c
@@ -523,6 +540,7 @@ flash_timeout_start_on_timer_2: @ 8000800
 	thumb_func_end flash_timeout_start_on_timer_2
 
 	thumb_func_start irq_hblank
+@ void irq_hblank()
 irq_hblank: @ 8000814
 	push {r4,lr}
 	ldr r4, =0x030022c0
@@ -548,6 +566,7 @@ _08000822:
 	thumb_func_end irq_hblank
 
 	thumb_func_start irq_vcount
+@ void irq_vcount()
 irq_vcount: @ 8000844
 	push {r4,lr}
 	ldr r4, =0x030022c0
@@ -574,6 +593,7 @@ _08000852:
 	thumb_func_end irq_vcount
 
 	thumb_func_start irq_serial
+@ void irq_serial()
 irq_serial: @ 8000878
 	push {r4,lr}
 	ldr r4, =0x030022c0
@@ -599,11 +619,13 @@ _08000886:
 	thumb_func_end irq_serial
 
 	thumb_func_start irq_other
+@ void irq_other()
 irq_other: @ 80008A8
 	bx lr
 	thumb_func_end irq_other
 
 	thumb_func_start wait_for_vblank
+@ void wait_for_vblank()
 wait_for_vblank: @ 80008AC
 	push {lr}
 	ldr r2, =0x030022c0
@@ -651,6 +673,7 @@ sub_80008E8: @ 80008E8
 	thumb_func_end sub_80008E8
 
 	thumb_func_start do_reset
+@ void do_reset()
 do_reset: @ 80008F4
 	push {r4,lr}
 	ldr r1, =0x04000208

asm/malloc.s

@@ -1,4 +1,5 @@
 	thumb_func_start malloc_header
+@ void malloc_header(struct memblk *blk, struct memblk *prev, struct memblk *next, u32 size)
 malloc_header: @ 8000988
 	push {r4,lr}
 	movs r4, 0
@@ -16,6 +17,7 @@ malloc_header: @ 8000988
 	thumb_func_end malloc_header
 
 	thumb_func_start malloc_unlinked_header
+@ void malloc_unlinked_header(struct memblk *blk, u32 size)
 malloc_unlinked_header: @ 80009A4
 	push {lr}
 	adds r2, r0, 0
@@ -28,6 +30,7 @@ malloc_unlinked_header: @ 80009A4
 	thumb_func_end malloc_unlinked_header
 
 	thumb_func_start malloc_core
+@ void *malloc_core(struct memblk *head, u32 size)
 malloc_core: @ 80009B8
 	push {r4-r6,lr}
 	adds r4, r0, 0
@@ -89,6 +92,7 @@ _08000A18:
 	thumb_func_end malloc_core
 
 	thumb_func_start free_core
+@ void free_core(struct memblk *head, struct memblk *node)
 free_core: @ 8000A20
 	push {r4,r5,lr}
 	cmp r1, 0
@@ -145,6 +149,7 @@ _08000A7C:
 	thumb_func_end free_core
 
 	thumb_func_start malloc_core_and_clear
+@ void *malloc_core_and_clear(struct memblk *head, unsigned int size)
 malloc_core_and_clear: @ 8000A84
 	push {r4,r5,lr}
 	sub sp, 0x4
@@ -180,6 +185,7 @@ _08000AB8:
 	thumb_func_end malloc_core_and_clear
 
 	thumb_func_start check_memblk_core
+@ _BOOL4 check_memblk_core(struct memblk *head, struct memblk *node)
 check_memblk_core: @ 8000AC4
 	push {r4,r5,lr}
 	adds r5, r0, 0
@@ -232,6 +238,7 @@ _08000B16:
 	thumb_func_end check_memblk_core
 
 	thumb_func_start init_malloc
+@ void init_malloc(u32 heapStart, u32 heapSize)
 init_malloc: @ 8000B1C
 	push {lr}
 	ldr r2, =0x03000004
@@ -246,6 +253,7 @@ init_malloc: @ 8000B1C
 	thumb_func_end init_malloc
 
 	thumb_func_start malloc
+@ void *malloc(u32 size)
 malloc: @ 8000B38
 	push {lr}
 	adds r1, r0, 0
@@ -259,6 +267,7 @@ malloc: @ 8000B38
 	thumb_func_end malloc
 
 	thumb_func_start malloc_and_clear
+@ void *malloc_and_clear(u32 size)
 malloc_and_clear: @ 8000B4C
 	push {lr}
 	adds r1, r0, 0
@@ -272,6 +281,7 @@ malloc_and_clear: @ 8000B4C
 	thumb_func_end malloc_and_clear
 
 	thumb_func_start free
+@ void free(void *ptr)
 free: @ 8000B60
 	push {lr}
 	adds r1, r0, 0
@@ -285,6 +295,7 @@ free: @ 8000B60
 	thumb_func_end free
 
 	thumb_func_start check_memblk
+@ _BOOL4 check_memblk(struct memblk *node)
 check_memblk: @ 8000B74
 	push {lr}
 	adds r1, r0, 0
@@ -298,6 +309,7 @@ check_memblk: @ 8000B74
 	thumb_func_end check_memblk
 
 	thumb_func_start check_all_memblks
+@ _BOOL4 check_all_memblks()
 check_all_memblks: @ 8000B88
 	push {r4,r5,lr}
 	ldr r0, =0x03000004

asm/pixel_buffer.s

@@ -36,6 +36,7 @@ sub_8002BDC: @ 8002BDC
 	thumb_func_end sub_8002BDC
 
 	thumb_func_start PixelBlock_CopyRect4Bpp
+@ void PixelBlock_CopyRect4Bpp(struct PixelBlock *src_pixels_data, struct PixelBlock *dest_pixels_data, u16 src_x, u16 src_y, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h, u8 a9)
 PixelBlock_CopyRect4Bpp: @ 8002C20
 	push {r4-r7,lr}
 	mov r7, r10
@@ -290,6 +291,7 @@ _08002DEE:
 	thumb_func_end PixelBlock_CopyRect4Bpp
 
 	thumb_func_start PixelBlock_FillRect4Bpp
+@ int PixelBlock_FillRect4Bpp(struct PixelBlock *pixels_data, u16 x, u16 y, u16 w, u16 h, u8 fill_value)
 PixelBlock_FillRect4Bpp: @ 8002E00
 	push {r4-r7,lr}
 	mov r7, r10
@@ -401,6 +403,7 @@ _08002EB6:
 	thumb_func_end PixelBlock_FillRect4Bpp
 
 	thumb_func_start PixelBlock_CopyRect4BppTo8Bpp
+@ void PixelBlock_CopyRect4BppTo8Bpp(struct PixelBlock *src_pixels_data, struct PixelBlock *dest_pixels_data, u16 src_x, u16 src_y, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h, int a9, int a10)
 PixelBlock_CopyRect4BppTo8Bpp: @ 8002EC8
 	push {r4-r7,lr}
 	mov r7, r10
@@ -717,6 +720,7 @@ _08003106:
 	thumb_func_end PixelBlock_CopyRect4BppTo8Bpp
 
 	thumb_func_start PixelBlock_FillRect8Bpp
+@ void PixelBlock_FillRect8Bpp(struct PixelBlock *pixels_data, u16 x, u16 y, u16 w, u16 h, char fill_value)
 PixelBlock_FillRect8Bpp: @ 8003118
 	push {r4-r7,lr}
 	mov r7, r10

asm/task.s

@@ -1,4 +1,5 @@
 	thumb_func_start clear_tasks
+@ void clear_tasks()
 clear_tasks: @ 80A8F50
 	push {r4-r7,lr}
 	movs r4, 0
@@ -46,6 +47,7 @@ _080A8F5A:
 	thumb_func_end clear_tasks
 
 	thumb_func_start AddTask
+@ int AddTask(void ( *func)(int task_id), u8 priority)
 AddTask: @ 80A8FB0
 	push {r4-r7,lr}
 	adds r2, r0, 0
@@ -91,6 +93,7 @@ _080A8FFC:
 	thumb_func_end AddTask
 
 	thumb_func_start insert_task_in_order_by_priority
+@ void insert_task_in_order_by_priority(int task_id)
 insert_task_in_order_by_priority: @ 80A9004
 	push {r4-r7,lr}
 	mov r7, r8
@@ -174,6 +177,7 @@ _080A9090:
 	thumb_func_end insert_task_in_order_by_priority
 
 	thumb_func_start remove_task
+@ void remove_task(int task_id)
 remove_task: @ 80A909C
 	push {r4,lr}
 	lsls r0, 24
@@ -237,6 +241,7 @@ _080A9106:
 	thumb_func_end remove_task
 
 	thumb_func_start run_active_tasks
+@ void run_active_tasks()
 run_active_tasks: @ 80A910C
 	push {r4,r5,lr}
 	bl get_first_active_task
@@ -264,6 +269,7 @@ _080A9130:
 	thumb_func_end run_active_tasks
 
 	thumb_func_start get_first_active_task
+@ int get_first_active_task()
 get_first_active_task: @ 80A913C
 	push {lr}
 	movs r2, 0
@@ -363,6 +369,7 @@ set_task_function_to_args_14_15: @ 80A91B0
 	thumb_func_end set_task_function_to_args_14_15
 
 	thumb_func_start is_function_an_active_task
+@ int is_function_an_active_task(void ( *func)(int task_id))
 is_function_an_active_task: @ 80A91E4
 	push {r4,lr}
 	adds r3, r0, 0
@@ -397,6 +404,7 @@ _080A9214:
 	thumb_func_end is_function_an_active_task
 
 	thumb_func_start get_task_id_by_function
+@ int get_task_id_by_function(void ( *func)(int task_id))
 get_task_id_by_function: @ 80A921C
 	push {lr}
 	adds r3, r0, 0

asm/text_renderer.s

@@ -1,4 +1,5 @@
 	thumb_func_start fboxes_set_ptr
+@ void fboxes_set_ptr(struct fbox *ptr)
 fboxes_set_ptr: @ 80045A4
 	ldr r1, =0x03002f80
 	str r0, [r1]
@@ -8,6 +9,7 @@ fboxes_set_ptr: @ 80045A4
 	thumb_func_end fboxes_set_ptr
 
 	thumb_func_start TextBox_ResetSomeField
+@ void TextBox_ResetSomeField()
 TextBox_ResetSomeField: @ 80045B0
 	push {lr}
 	ldr r1, =0x020201b0
@@ -26,6 +28,7 @@ _080045BA:
 	thumb_func_end TextBox_ResetSomeField
 
 	thumb_func_start Print
+@ int Print(u8 windowId, u8 fontId, int char_cursor, char x, char y, u8 a6, int a7)
 Print: @ 80045D0
 	push {r4-r7,lr}
 	mov r7, r8
@@ -115,6 +118,7 @@ Print: @ 80045D0
 	thumb_func_end Print
 
 	thumb_func_start remo_copy
+@ int remo_copy(struct TextBox *x, u8 text_speed, int a3)
 remo_copy: @ 800467C
 	push {r4-r7,lr}
 	adds r6, r0, 0
@@ -241,6 +245,7 @@ _08004766:
 	thumb_func_end remo_copy
 
 	thumb_func_start run_remoboxes
+@ void run_remoboxes()
 run_remoboxes: @ 8004778
 	push {r4-r7,lr}
 	mov r7, r8
@@ -328,6 +333,7 @@ a_pressed_maybe: @ 8004800
 	thumb_func_end a_pressed_maybe
 
 	thumb_func_start fbox_exec
+@ int fbox_exec(struct TextBox *x)
 fbox_exec: @ 8004818
 	push {r4,lr}
 	adds r4, r0, 0
@@ -841,6 +847,7 @@ restore_remo_colors: @ 8004C00
 	thumb_func_end restore_remo_colors
 
 	thumb_func_start font_render_sub
+@ void font_render_sub(u16 *src, u32 *dest)
 font_render_sub: @ 8004C10
 	push {r4-r7,lr}
 	mov r7, r8
@@ -1048,6 +1055,7 @@ _08004D9A:
 	thumb_func_end sub_8004D58
 
 	thumb_func_start CopyGlyphToWindow
+@ int CopyGlyphToWindow(struct TextBox *x)
 CopyGlyphToWindow: @ 8004DA0
 	push {r4-r7,lr}
 	mov r7, r10
@@ -1754,6 +1762,7 @@ _080052AA:
 	thumb_func_end CopyGlyphToWindow
 
 	thumb_func_start Text_ClearHorizontalSpan
+@ void Text_ClearHorizontalSpan(TextBox *textBox, int width)
 Text_ClearHorizontalSpan: @ 80052C8
 	push {r4-r6,lr}
 	sub sp, 0x10
@@ -1807,6 +1816,7 @@ _0800531E:
 	thumb_func_end Text_ClearHorizontalSpan
 
 	thumb_func_start fbox0_func
+@ int fbox0_func(struct TextBox *x)
 fbox0_func: @ 800533C
 	push {lr}
 	adds r2, r0, 0
@@ -1836,6 +1846,7 @@ _08005360:
 	thumb_func_end fbox0_func
 
 	thumb_func_start fbox1_func
+@ int fbox1_func(struct TextBox *x)
 fbox1_func: @ 8005370
 	push {lr}
 	adds r2, r0, 0
@@ -1867,6 +1878,7 @@ _08005398:
 	thumb_func_end fbox1_func
 
 	thumb_func_start fbox2_func
+@ int fbox2_func(struct TextBox *x)
 fbox2_func: @ 80053A8
 	push {lr}
 	adds r2, r0, 0
@@ -1898,6 +1910,7 @@ _080053D0:
 	thumb_func_end fbox2_func
 
 	thumb_func_start fbox3_func
+@ int fbox3_func(struct TextBox *x)
 fbox3_func: @ 80053E0
 	push {lr}
 	adds r2, r0, 0
@@ -1929,6 +1942,7 @@ _08005408:
 	thumb_func_end fbox3_func
 
 	thumb_func_start fbox4_func
+@ int fbox4_func(struct TextBox *x)
 fbox4_func: @ 8005418
 	push {lr}
 	adds r2, r0, 0
@@ -1960,6 +1974,7 @@ _08005440:
 	thumb_func_end fbox4_func
 
 	thumb_func_start fbox5_func
+@ int fbox5_func(struct TextBox *x)
 fbox5_func: @ 8005450
 	push {lr}
 	adds r2, r0, 0
@@ -1991,6 +2006,7 @@ _08005478:
 	thumb_func_end fbox5_func
 
 	thumb_func_start fbox7_func
+@ int fbox7_func(struct TextBox *x)
 fbox7_func: @ 8005488
 	push {lr}
 	adds r2, r0, 0
@@ -2022,6 +2038,7 @@ _080054B0:
 	thumb_func_end fbox7_func
 
 	thumb_func_start fbox8_func
+@ int fbox8_func(struct TextBox *x)
 fbox8_func: @ 80054C0
 	push {lr}
 	adds r2, r0, 0
@@ -2053,6 +2070,7 @@ _080054E8:
 	thumb_func_end fbox8_func
 
 	thumb_func_start sub_80054F8
+@ void sub_80054F8(TextBox *textBox)
 sub_80054F8: @ 80054F8
 	push {lr}
 	adds r2, r0, 0
@@ -2083,6 +2101,7 @@ _08005524:
 	thumb_func_end sub_80054F8
 
 	thumb_func_start remo_draw_bouncing_down_arrow
+@ int remo_draw_bouncing_down_arrow(TextBox *x)
 remo_draw_bouncing_down_arrow: @ 8005528
 	push {r4-r7,lr}
 	sub sp, 0x18
@@ -2193,6 +2212,7 @@ _080055EE:
 	thumb_func_end remo_draw_bouncing_down_arrow
 
 	thumb_func_start remo_clear_down_arrow
+@ int remo_clear_down_arrow(TextBox *x)
 remo_clear_down_arrow: @ 8005600
 	push {r4,r5,lr}
 	sub sp, 0x8
@@ -2220,6 +2240,7 @@ remo_clear_down_arrow: @ 8005600
 	thumb_func_end remo_clear_down_arrow
 
 	thumb_func_start remo_is_it_time_to_continue_autopilot
+@ int remo_is_it_time_to_continue_autopilot(struct TextBox *x)
 remo_is_it_time_to_continue_autopilot: @ 8005634
 	push {lr}
 	adds r1, r0, 0
@@ -2422,6 +2443,7 @@ _0800579A:
 	thumb_func_end draw_bouncing_down_arrow_2
 
 	thumb_func_start font_render_b
+@ int font_render_b(struct TextBox *x)
 font_render_b: @ 80057B4
 	push {r4-r6,lr}
 	adds r6, r0, 0
@@ -3334,6 +3356,7 @@ _08005ED0:
 	thumb_func_end font_get_get_width_func
 
 	thumb_func_start font_get_width_of_string
+@ unsigned int font_get_width_of_string(u8 a1, u8 *s, u16 a3)
 font_get_width_of_string: @ 8005ED8
 	push {r4-r7,lr}
 	mov r7, r10
@@ -3651,6 +3674,7 @@ _0800612E:
 	thumb_func_end font_get_width_of_string
 
 	thumb_func_start font_render_some
+@ int font_render_some(char *pixels, u8 font, int a3)
 font_render_some: @ 8006140
 	push {r4-r7,lr}
 	mov r7, r10
@@ -4284,6 +4308,7 @@ _08006642:
 	thumb_func_end get_font_width_black_en
 
 	thumb_func_start Text_DecompressGlyphFont8
+@ void Text_DecompressGlyphFont8(u16 glyphIndex, bool japanese)
 Text_DecompressGlyphFont8: @ 8006648
 	push {r4,r5,lr}
 	lsls r0, 16
@@ -4522,6 +4547,7 @@ _08006832:
 	thumb_func_end get_font_width_unk
 
 	thumb_func_start Text_DecompressGlyphFont1
+@ void Text_DecompressGlyphFont1(int a1, int japanese)
 Text_DecompressGlyphFont1: @ 8006840
 	push {r4-r6,lr}
 	lsls r0, 16

asm/window.s

@@ -4,6 +4,7 @@ nullsub_8: @ 80031BC
 	thumb_func_end nullsub_8
 
 	thumb_func_start Window_InitFromTemplates
+@ int Window_InitFromTemplates(struct rbox_template *template)
 Window_InitFromTemplates: @ 80031C0
 	push {r4-r7,lr}
 	mov r7, r10
@@ -219,6 +220,7 @@ _08003364:
 	thumb_func_end Window_InitFromTemplates
 
 	thumb_func_start Window_AddFromTemplate
+@ int Window_AddFromTemplate(struct rbox_template *template)
 Window_AddFromTemplate: @ 8003380
 	push {r4-r7,lr}
 	mov r7, r10
@@ -386,6 +388,7 @@ _080034C0:
 	thumb_func_end Window_AddFromTemplate
 
 	thumb_func_start Window_AddFromTemplateWithoutAllocatingMemory
+@ int Window_AddFromTemplateWithoutAllocatingMemory(struct rbox_template *template)
 Window_AddFromTemplateWithoutAllocatingMemory: @ 80034D8
 	push {r4-r6,lr}
 	adds r5, r0, 0
@@ -467,6 +470,7 @@ _08003564:
 	thumb_func_end Window_AddFromTemplateWithoutAllocatingMemory
 
 	thumb_func_start Window_Remove
+@ int Window_Remove(int rbox_id)
 Window_Remove: @ 8003574
 	push {r4-r7,lr}
 	lsls r0, 24
@@ -533,6 +537,7 @@ _080035E8:
 	thumb_func_end Window_Remove
 
 	thumb_func_start Window_FreeMemory
+@ void Window_FreeMemory()
 Window_FreeMemory: @ 8003604
 	push {r4-r6,lr}
 	ldr r4, =0x03002f70
@@ -577,6 +582,7 @@ _0800363E:
 	thumb_func_end Window_FreeMemory
 
 	thumb_func_start Window_CopyToVram
+@ void Window_CopyToVram(u8 rbox_id, u8 mode)
 Window_CopyToVram: @ 8003658
 	push {r4-r6,lr}
 	sub sp, 0xC
@@ -645,6 +651,7 @@ _080036CE:
 	thumb_func_end Window_CopyToVram
 
 	thumb_func_start Window_CopyRectToVram
+@ void Window_CopyRectToVram(int rbox_id, int mode, int x, int y, int w, int h)
 Window_CopyRectToVram: @ 80036D8
 	push {r4-r7,lr}
 	sub sp, 0xC
@@ -739,6 +746,7 @@ _08003782:
 	thumb_func_end Window_CopyRectToVram
 
 	thumb_func_start Window_WriteStandardTileMap
+@ void Window_WriteStandardTileMap(int rbox_id)
 Window_WriteStandardTileMap: @ 800378C
 	push {r4,lr}
 	sub sp, 0x1C
@@ -789,6 +797,7 @@ Window_WriteStandardTileMap: @ 800378C
 	thumb_func_end Window_WriteStandardTileMap
 
 	thumb_func_start Window_WriteStandardTileMapRectOverridePalette
+@ void Window_WriteStandardTileMapRectOverridePalette(u8 rbox_id, u8 x, u8 y, u8 w, u8 h, u8 palette)
 Window_WriteStandardTileMapRectOverridePalette: @ 80037EC
 	push {r4-r7,lr}
 	mov r7, r10
@@ -884,6 +893,7 @@ _0800388E:
 	thumb_func_end Window_WriteStandardTileMapRectOverridePalette
 
 	thumb_func_start Window_FillTileMap
+@ void Window_FillTileMap(int rbox_id)
 Window_FillTileMap: @ 80038A4
 	push {r4,lr}
 	sub sp, 0x18
@@ -924,6 +934,7 @@ Window_FillTileMap: @ 80038A4
 	thumb_func_end Window_FillTileMap
 
 	thumb_func_start Window_WriteStandardTileMapRect
+@ void Window_WriteStandardTileMapRect(u8 rbox_id, u8 x, u8 y, u8 w, u8 h)
 Window_WriteStandardTileMapRect: @ 80038F4
 	push {r4-r7,lr}
 	mov r7, r10
@@ -1015,6 +1026,7 @@ _0800398E:
 	thumb_func_end Window_WriteStandardTileMapRect
 
 	thumb_func_start Window_CopyWholePixelBlockToWindow
+@ void Window_CopyWholePixelBlockToWindow(u8 rbox_id, int a2, u16 x, u16 y, u16 w, u16 h)
 Window_CopyWholePixelBlockToWindow: @ 80039A4
 	push {r4,r5,lr}
 	sub sp, 0x18
@@ -1046,6 +1058,7 @@ Window_CopyWholePixelBlockToWindow: @ 80039A4
 	thumb_func_end Window_CopyWholePixelBlockToWindow
 
 	thumb_func_start Window_CopyPixelRectToWindow
+@ void Window_CopyPixelRectToWindow(u8 rbox_id, void *pixels, u16 src_x, u16 src_y, u16 src_w, int src_h, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h)
 Window_CopyPixelRectToWindow: @ 80039DC
 	push {r4-r7,lr}
 	mov r7, r10
@@ -1140,6 +1153,7 @@ Window_CopyPixelRectToWindow: @ 80039DC
 	thumb_func_end Window_CopyPixelRectToWindow
 
 	thumb_func_start Window_copy_pixels_rect_3
+@ void Window_copy_pixels_rect_3(u8 rbox_id, void *pixels, u16 src_x, u16 src_y, u16 src_w, int src_h, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h, u8 a11)
 Window_copy_pixels_rect_3: @ 8003A9C
 	push {r4-r7,lr}
 	mov r7, r10
@@ -1238,6 +1252,7 @@ Window_copy_pixels_rect_3: @ 8003A9C
 	thumb_func_end Window_copy_pixels_rect_3
 
 	thumb_func_start Window_FillPixelRect
+@ void Window_FillPixelRect(u8 rbox_id, char fill_value, u16 x, u16 y, u16 w, u16 h)
 Window_FillPixelRect: @ 8003B64
 	push {r4-r6,lr}
 	mov r6, r9
@@ -1352,6 +1367,7 @@ _08003C3C:
 	thumb_func_end Window_CopyToPixels
 
 	thumb_func_start Window_FastFillPixels
+@ void Window_FastFillPixels(u8 rbox_id, int value)
 Window_FastFillPixels: @ 8003C48
 	push {r4,r5,lr}
 	sub sp, 0x4
@@ -1392,6 +1408,7 @@ Window_FastFillPixels: @ 8003C48
 	thumb_func_end Window_FastFillPixels
 
 	thumb_func_start Window_ScrollVertically
+@ int Window_ScrollVertically(u8 a1, u8 mode, u8 a3, int a4)
 Window_ScrollVertically: @ 8003C94
 	push {r4-r7,lr}
 	mov r7, r10
@@ -1918,6 +1935,7 @@ _08004046:
 	thumb_func_end Window_ScrollVertically
 
 	thumb_func_start CallWindowFunction
+@ void CallWindowFunction(u8 windowId, void ( *functionPointer)(s8, s8, s8, s8))
 CallWindowFunction: @ 8004058
 	push {r4-r6,lr}
 	mov r6, r8
@@ -2161,6 +2179,7 @@ _0800422A:
 	thumb_func_end Window_GetField
 
 	thumb_func_start GetNumActiveWindowsOnBg
+@ int GetNumActiveWindowsOnBg(int bg_id)
 GetNumActiveWindowsOnBg: @ 8004230
 	push {r4,lr}
 	lsls r0, 24
@@ -2194,6 +2213,7 @@ nullsub_9: @ 800425C
 	thumb_func_end nullsub_9
 
 	thumb_func_start Window_AddFromTemplate8Bpp
+@ int Window_AddFromTemplate8Bpp(struct rbox_template *template)
 Window_AddFromTemplate8Bpp: @ 8004260
 	push {r4-r7,lr}
 	mov r7, r10
@@ -2325,6 +2345,7 @@ _08004356:
 	thumb_func_end Window_AddFromTemplate8Bpp
 
 	thumb_func_start Window_FillPixels8Bpp
+@ void Window_FillPixels8Bpp(u8 rbox_id, char value)
 Window_FillPixels8Bpp: @ 8004368
 	push {r4-r6,lr}
 	lsls r0, 24
@@ -2363,6 +2384,7 @@ _0800439E:
 	thumb_func_end Window_FillPixels8Bpp
 
 	thumb_func_start Window_FillPixelRect8Bpp
+@ void Window_FillPixelRect8Bpp(u8 a1, char fill_value, u16 x, u16 y, u16 w, u16 h)
 Window_FillPixelRect8Bpp: @ 80043A8
 	push {r4-r6,lr}
 	mov r6, r9
@@ -2431,6 +2453,7 @@ Window_FillPixelRect8Bpp: @ 80043A8
 	thumb_func_end Window_FillPixelRect8Bpp
 
 	thumb_func_start Window_CopyPixelRectToWindow4BppTo8Bpp
+@ void Window_CopyPixelRectToWindow4BppTo8Bpp(u8 rbox_id, void *pixels, u16 src_x, u16 src_y, u16 src_w, int src_h, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h, u8 a11)
 Window_CopyPixelRectToWindow4BppTo8Bpp: @ 8004434
 	push {r4-r7,lr}
 	mov r7, r10
@@ -2591,6 +2614,7 @@ _08004570:
 	thumb_func_end Window_CopyToVram8Bpp
 
 	thumb_func_start GetNumActiveWindowsOnBgDuplicate
+@ int GetNumActiveWindowsOnBgDuplicate(int bg_id)
 GetNumActiveWindowsOnBgDuplicate: @ 8004578
 	push {r4,lr}
 	lsls r0, 24