Merge remote-tracking branch 'Egg/decompile_use_pokeblock'

asm/berry_tag_screen.s

@@ -115,7 +115,7 @@ _08177CD8:
 	.4byte _08177DC2
 _08177D18:
 	bl SetVBlankHBlankCallbacksToNull
-	bl sub_8121DA0
+	bl ResetVramOamAndBgCntRegs
 	bl clear_scheduled_bg_copies_to_vram
 	b _08177DDC
 _08177D26:
@@ -246,7 +246,7 @@ sub_8177E14: @ 8177E14
 	adds r1, r0
 	movs r0, 0x3
 	bl SetBgTilemapBuffer
-	bl sub_8121E10
+	bl ResetAllBgsCoordinates
 	movs r0, 0x2
 	bl schedule_bg_copy_tilemap_to_vram
 	movs r0, 0x3

asm/item_menu.s

@@ -463,7 +463,7 @@ _081AAF54:
 	adds r5, r0, 0
 	lsls r5, 24
 	lsrs r5, 24
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldrb r2, [r4, 0x5]
 	lsls r2, 1
 	adds r1, r4, 0
@@ -568,7 +568,7 @@ _081AB046:
 	thumb_func_start bag_menu_init_bgs
 bag_menu_init_bgs: @ 81AB050
 	push {r4,lr}
-	bl sub_8121DA0
+	bl ResetVramOamAndBgCntRegs
 	ldr r4, =gUnknown_0203CE54
 	ldr r0, [r4]
 	adds r0, 0x4
@@ -586,7 +586,7 @@ bag_menu_init_bgs: @ 81AB050
 	adds r1, 0x4
 	movs r0, 0x2
 	bl SetBgTilemapBuffer
-	bl sub_8121E10
+	bl ResetAllBgsCoordinates
 	movs r0, 0x2
 	bl schedule_bg_copy_tilemap_to_vram
 	movs r1, 0x82
@@ -719,7 +719,7 @@ _081AB1B2:
 	b _081AB1E4
 	.pool
 _081AB1CC:
-	bl sub_8122328
+	bl LoadListMenuArrowsGfx
 	ldr r0, [r4]
 	ldr r1, =0x00000834
 	adds r0, r1
@@ -902,7 +902,7 @@ _081AB30C:
 	cmp r6, r0
 	bcc _081AB30C
 _081AB34A:
-	ldr r2, =gUnknown_03006310
+	ldr r2, =gMultiuseListMenuTemplate
 	adds r1, r2, 0
 	ldr r0, =gUnknown_08613F9C
 	ldm r0!, {r3-r5}
@@ -1924,7 +1924,7 @@ bag_menu_inits_lists_menu: @ 81ABBBC
 	bl sub_81ABA88
 	ldrb r0, [r7, 0x5]
 	bl load_bag_item_list_buffers
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	mov r2, r8
 	ldrh r1, [r2]
 	ldrh r2, [r4]
@@ -2133,7 +2133,7 @@ _081ABDCC:
 	ldrb r0, [r6]
 	adds r1, r7, 0
 	mov r2, r8
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	ldrh r2, [r7]
 	mov r3, r8
 	ldrh r0, [r3]
@@ -2157,12 +2157,12 @@ _081ABDCC:
 	.pool
 _081ABE10:
 	ldrb r0, [r6]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	adds r4, r0, 0
 	ldrb r0, [r6]
 	adds r1, r7, 0
 	mov r2, r8
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	movs r0, 0x2
 	negs r0, r0
 	cmp r4, r0
@@ -2603,7 +2603,7 @@ _081AC1DC:
 	subs r5, r4, 0x5
 	ldrb r0, [r5, 0x5]
 	bl load_bag_item_list_buffers
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldrb r2, [r5, 0x5]
 	lsls r2, 1
 	adds r1, r4, 0
@@ -2847,12 +2847,12 @@ sub_81AC3C0: @ 81AC3C0
 	adds r1, r2, r1
 	adds r3, 0x8
 	adds r2, r3
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	b _081AC472
 	.pool
 _081AC418:
 	ldrb r0, [r4]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	adds r7, r0, 0
 	ldrb r0, [r4]
 	ldr r5, =gUnknown_0203CE58
@@ -2864,7 +2864,7 @@ _081AC418:
 	adds r4, r5, 0
 	adds r4, 0x8
 	adds r2, r4
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	movs r0, 0
 	bl sub_80D4FC8
 	ldrb r0, [r5, 0x5]
@@ -2989,7 +2989,7 @@ _081AC4F8:
 _081AC538:
 	ldrb r0, [r5, 0x5]
 	bl load_bag_item_list_buffers
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	mov r2, r8
 	ldrh r1, [r2]
 	ldrh r2, [r7]
@@ -3070,7 +3070,7 @@ sub_81AC590: @ 81AC590
 _081AC5F2:
 	ldrb r0, [r4, 0x5]
 	bl load_bag_item_list_buffers
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldrh r1, [r6]
 	ldrh r2, [r5]
 	bl ListMenuInit
@@ -4326,7 +4326,7 @@ Task_ActuallyToss: @ 81AD150
 	bl sub_81ABA88
 	ldrb r0, [r4, 0x5]
 	bl load_bag_item_list_buffers
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	mov r2, r8
 	ldrh r1, [r2]
 	ldrh r2, [r7]
@@ -4388,7 +4388,7 @@ _081AD23A:
 	ldr r0, =gUnknown_0203CE58
 	ldrb r0, [r0, 0x5]
 	bl load_bag_item_list_buffers
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldrh r1, [r6]
 	ldrh r2, [r5]
 	bl ListMenuInit
@@ -5155,7 +5155,7 @@ sub_81AD8C8: @ 81AD8C8
 	bl sub_81ABA88
 	ldrb r0, [r7, 0x5]
 	bl load_bag_item_list_buffers
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	mov r2, r9
 	ldrh r1, [r2]
 	ldrh r2, [r5]

asm/item_use.s

@@ -1497,7 +1497,7 @@ sub_80FDBEC: @ 80FDBEC
 	push {lr}
 	ldr r1, =bag_menu_mail_related
 	movs r0, 0
-	bl sub_81357FC
+	bl OpenPokeblockCase
 	pop {r0}
 	bx r0
 	.pool
@@ -1517,7 +1517,7 @@ sub_80FDC00: @ 80FDC00
 	bl overworld_free_bg_tilemaps
 	ldr r1, =c2_exit_to_overworld_2_switch
 	movs r0, 0
-	bl sub_81357FC
+	bl OpenPokeblockCase
 	adds r0, r4, 0
 	bl DestroyTask
 _080FDC24:

asm/learn_move.s

@@ -94,7 +94,7 @@ sub_81606A0: @ 81606A0
 	ldr r0, =gUnknown_085CEBB8
 	bl LoadSpritePalette
 	bl sub_81610B8
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldrh r1, [r4]
 	ldrh r2, [r4, 0x2]
 	bl ListMenuInit
@@ -151,7 +151,7 @@ sub_8160740: @ 8160740
 	ldr r0, =gUnknown_085CEBB8
 	bl LoadSpritePalette
 	bl sub_81610B8
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldrh r1, [r4]
 	ldrh r2, [r4, 0x2]
 	bl ListMenuInit
@@ -175,14 +175,14 @@ sub_8160740: @ 8160740
 	thumb_func_start sub_81607EC
 sub_81607EC: @ 81607EC
 	push {lr}
-	bl sub_8121DA0
+	bl ResetVramOamAndBgCntRegs
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
 	ldr r1, =gUnknown_085CEC28
 	movs r0, 0
 	movs r2, 0x2
 	bl InitBgsFromTemplates
-	bl sub_8121E10
+	bl ResetAllBgsCoordinates
 	movs r1, 0x82
 	lsls r1, 5
 	movs r0, 0
@@ -980,7 +980,7 @@ sub_8160F50: @ 8160F50
 	lsls r4, 1
 	adds r0, r4
 	ldrb r0, [r0]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	adds r5, r0, 0
 	ldr r0, [r6]
 	adds r0, r4
@@ -988,7 +988,7 @@ sub_8160F50: @ 8160F50
 	ldr r4, =gUnknown_0203BC38
 	adds r2, r4, 0x2
 	adds r1, r4, 0
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	movs r0, 0x2
 	negs r0, r0
 	cmp r5, r0

asm/link.s

@@ -18243,7 +18243,7 @@ _08012938:
 	ldrb r0, [r6, 0xF]
 	movs r1, 0
 	bl sub_81973FC
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	adds r2, r0, 0
 	ldr r1, =gUnknown_082F015C
 	ldm r1!, {r3,r5,r7}
@@ -19724,7 +19724,7 @@ _0801360C:
 	ldrb r0, [r6, 0xB]
 	movs r1, 0
 	bl sub_81973FC
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	adds r2, r0, 0
 	ldr r1, =gUnknown_082F0204
 	ldm r1!, {r3,r5,r7}
@@ -19769,7 +19769,7 @@ _080136EA:
 	b _08013A72
 _080136F2:
 	ldrb r0, [r6, 0xE]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	adds r4, r0, 0
 	ldr r0, =gMain
 	ldrh r1, [r0, 0x2E]
@@ -21038,7 +21038,7 @@ sub_8014210: @ 8014210
 	adds r6, r0, 0
 	lsls r6, 16
 	lsrs r6, 16
-	bl sp000_heal_pokemon
+	bl HealPlayerParty
 	bl copy_player_party_to_sav1
 	bl copy_bags_and_unk_data_from_save_blocks
 	ldr r5, =gLinkPlayers
@@ -21406,7 +21406,7 @@ _080145F4:
 	ldr r0, =gBlockSendBuffer
 	movs r1, 0x1
 	bl sub_80143E4
-	bl sp000_heal_pokemon
+	bl HealPlayerParty
 	bl copy_player_party_to_sav1
 	bl copy_bags_and_unk_data_from_save_blocks
 	movs r0, 0x1
@@ -21419,7 +21419,7 @@ _080145F4:
 	.pool
 _08014620:
 	bl overworld_free_bg_tilemaps
-	bl sp000_heal_pokemon
+	bl HealPlayerParty
 	bl copy_player_party_to_sav1
 	bl copy_bags_and_unk_data_from_save_blocks
 	ldr r0, =gBlockSendBuffer
@@ -21435,7 +21435,7 @@ _08014620:
 	.pool
 _0801464C:
 	bl overworld_free_bg_tilemaps
-	bl sp000_heal_pokemon
+	bl HealPlayerParty
 	bl copy_player_party_to_sav1
 	bl copy_bags_and_unk_data_from_save_blocks
 	ldr r0, =gBlockSendBuffer
@@ -21969,7 +21969,7 @@ _08014AEC:
 	strb r0, [r5, 0xF]
 	ldrb r0, [r5, 0xF]
 	bl sub_8018784
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	adds r2, r0, 0
 	ldr r1, =gUnknown_082F015C
 	ldm r1!, {r3,r4,r6}
@@ -22501,7 +22501,7 @@ _08014FE8:
 	strb r0, [r7, 0xD]
 	ldrb r0, [r7, 0xB]
 	bl sub_8018784
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	adds r2, r0, 0
 	ldr r1, =gUnknown_082F0204
 	ldm r1!, {r3-r5}
@@ -22549,7 +22549,7 @@ _080150CE:
 	b _080152A0
 _080150D6:
 	ldrb r0, [r7, 0xE]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	adds r2, r0, 0
 	ldr r0, =gMain
 	ldrh r1, [r0, 0x2E]
@@ -22874,7 +22874,7 @@ _08015398:
 	strb r0, [r5, 0xB]
 	ldrb r0, [r5, 0xB]
 	bl sub_8018784
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	adds r2, r0, 0
 	ldr r1, =gUnknown_082F0204
 	ldm r1!, {r3,r4,r6}
@@ -22920,7 +22920,7 @@ _08015446:
 	cmp r0, 0
 	beq _08015452
 	ldrb r0, [r5, 0xE]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 _08015452:
 	ldrb r0, [r5, 0x14]
 	cmp r0, 0x78
@@ -26270,7 +26270,7 @@ _080171DC:
 	ldrb r0, [r5]
 	movs r1, 0
 	bl sub_81973FC
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	adds r2, r0, 0
 	ldr r1, [sp, 0x24]
 	ldm r1!, {r3,r4,r6}
@@ -26295,7 +26295,7 @@ _080171DC:
 _08017228:
 	mov r3, r9
 	ldrb r0, [r3]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	mov r8, r0
 	ldr r0, =gMain
 	ldrh r1, [r0, 0x2E]
@@ -26383,7 +26383,7 @@ _080172C8:
 	ldrb r0, [r6]
 	movs r1, 0
 	bl sub_81973FC
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	adds r2, r0, 0
 	ldr r1, [sp, 0x24]
 	ldm r1!, {r3,r4,r7}
@@ -26411,7 +26411,7 @@ _08017314:
 _0801731C:
 	mov r3, r10
 	ldrb r0, [r3]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	adds r1, r0, 0
 	ldr r0, =gMain
 	ldrh r2, [r0, 0x2E]

asm/list_menu.s

@@ -64,7 +64,7 @@ _081AE4B0:
 	ldr r1, [sp, 0x4]
 	bl sub_8098858
 _081AE4C0:
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	adds r2, r0, 0
 	ldr r1, [sp]
 	ldm r1!, {r3-r5}
@@ -87,7 +87,7 @@ _081AE4C0:
 	.pool
 _081AE4F4:
 	ldrb r0, [r5, 0x6]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	str r0, [r5]
 	ldr r1, =gMain
 	ldrh r0, [r1, 0x2E]
@@ -227,9 +227,9 @@ _081AE5F0:
 	bx r1
 	thumb_func_end Unused_ListMenuInit2
 
-	thumb_func_start ListMenuHandleInput
+	thumb_func_start ListMenuHandleInputGetItemId
-@ int ListMenuHandleInput(u8 taskId)
+@ int ListMenuHandleInputGetItemId(u8 taskId)
-ListMenuHandleInput: @ 81AE604
+ListMenuHandleInputGetItemId: @ 81AE604
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -337,7 +337,7 @@ _081AE6BE:
 _081AE6C2:
 	pop {r1}
 	bx r1
-	thumb_func_end ListMenuHandleInput
+	thumb_func_end ListMenuHandleInputGetItemId
 
 	thumb_func_start sub_81AE6C8
 sub_81AE6C8: @ 81AE6C8
@@ -557,8 +557,8 @@ _081AE856:
 	.pool
 	thumb_func_end sub_81AE838
 
-	thumb_func_start get_coro_args_x18_x1A
+	thumb_func_start sub_81AE860
-get_coro_args_x18_x1A: @ 81AE860
+sub_81AE860: @ 81AE860
 	push {lr}
 	adds r3, r1, 0
 	lsls r0, 24
@@ -581,7 +581,7 @@ _081AE882:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end get_coro_args_x18_x1A
+	thumb_func_end sub_81AE860
 
 	thumb_func_start ListMenuGetYCoordForPrintingArrowCursor
 @ u8 ListMenuGetYCoordForPrintingArrowCursor(u8 taskId)

asm/menu_helpers.s

@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start sub_8121DA0
+	thumb_func_start ResetVramOamAndBgCntRegs
-sub_8121DA0: @ 8121DA0
+ResetVramOamAndBgCntRegs: @ 8121DA0
 	push {r4,lr}
 	sub sp, 0xC
 	movs r0, 0
@@ -50,10 +50,10 @@ sub_8121DA0: @ 8121DA0
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8121DA0
+	thumb_func_end ResetVramOamAndBgCntRegs
 
-	thumb_func_start sub_8121E10
+	thumb_func_start ResetAllBgsCoordinates
-sub_8121E10: @ 8121E10
+ResetAllBgsCoordinates: @ 8121E10
 	push {lr}
 	movs r0, 0
 	movs r1, 0
@@ -89,7 +89,7 @@ sub_8121E10: @ 8121E10
 	bl ChangeBgY
 	pop {r0}
 	bx r0
-	thumb_func_end sub_8121E10
+	thumb_func_end ResetAllBgsCoordinates
 
 	thumb_func_start SetVBlankHBlankCallbacksToNull
 @ void SetVBlankHBlankCallbacksToNull()
@@ -177,8 +177,8 @@ _08121EC0:
 	.pool
 	thumb_func_end DisplayMessageAndContinueTask
 
-	thumb_func_start sub_8121F20
+	thumb_func_start RunTextPrintersRetIsActive
-sub_8121F20: @ 8121F20
+RunTextPrintersRetIsActive: @ 8121F20
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -191,7 +191,7 @@ sub_8121F20: @ 8121F20
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_8121F20
+	thumb_func_end RunTextPrintersRetIsActive
 
 	thumb_func_start Task_ContinueTaskAfterMessagePrints
 @ void Task_ContinueTaskAfterMessagePrints(u8 taskId)
@@ -201,7 +201,7 @@ Task_ContinueTaskAfterMessagePrints: @ 8121F3C
 	lsrs r4, r0, 24
 	ldr r0, =gUnknown_0203A140
 	ldrb r0, [r0]
-	bl sub_8121F20
+	bl RunTextPrintersRetIsActive
 	lsls r0, 16
 	cmp r0, 0
 	bne _08121F5A
@@ -752,8 +752,8 @@ _08122322:
 	bx r0
 	thumb_func_end sub_8122298
 
-	thumb_func_start sub_8122328
+	thumb_func_start LoadListMenuArrowsGfx
-sub_8122328: @ 8122328
+LoadListMenuArrowsGfx: @ 8122328
 	push {lr}
 	ldr r0, =gUnknown_0859F514
 	bl LoadCompressedObjectPic
@@ -762,7 +762,7 @@ sub_8122328: @ 8122328
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8122328
+	thumb_func_end LoadListMenuArrowsGfx
 
 	thumb_func_start sub_8122344
 sub_8122344: @ 8122344

asm/overworld.s

@@ -21,7 +21,7 @@ sub_8084620: @ 8084620
 	lsrs r1, 1
 	adds r0, r4, 0
 	bl SetMoney
-	bl sp000_heal_pokemon
+	bl HealPlayerParty
 	bl sub_8084720
 	bl copy_saved_warp3_bank_and_enter_x_to_warp1
 	bl warp_in

asm/party_menu.s

@@ -98,7 +98,7 @@ _081B0234:
 	.4byte _081B0474
 _081B0290:
 	bl SetVBlankHBlankCallbacksToNull
-	bl sub_8121DA0
+	bl ResetVramOamAndBgCntRegs
 	bl clear_scheduled_bg_copies_to_vram
 	ldr r1, =gMain
 	movs r0, 0x87
@@ -429,7 +429,7 @@ sub_81B0550: @ 81B0550
 	ldr r1, [r5]
 	movs r0, 0x1
 	bl SetBgTilemapBuffer
-	bl sub_8121E10
+	bl ResetAllBgsCoordinates
 	movs r0, 0x1
 	bl schedule_bg_copy_tilemap_to_vram
 	movs r1, 0x82
@@ -3161,7 +3161,7 @@ sub_81B1B8C: @ 81B1B8C
 	lsrs r4, r0, 24
 	adds r5, r4, 0
 	movs r0, 0x6
-	bl sub_8121F20
+	bl RunTextPrintersRetIsActive
 	lsls r0, 16
 	lsrs r0, 16
 	cmp r0, 0x1

asm/player_pc.s

@@ -733,7 +733,7 @@ sub_816B430: @ 816B430
 	bl sub_816B4C0
 	bl sub_816BC14
 	bl gpu_pal_allocator_reset__manage_upper_four
-	bl sub_8122328
+	bl LoadListMenuArrowsGfx
 	ldr r0, =gUnknown_0203BCC4
 	ldr r0, [r0]
 	movs r1, 0xCD
@@ -1013,7 +1013,7 @@ sub_816B674: @ 816B674
 	cmp r0, 0
 	bne _0816B71E
 	ldrb r0, [r4, 0xA]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	adds r6, r0, 0
 	ldrb r0, [r4, 0xA]
 	ldr r7, =gUnknown_0203BCBA
@@ -1021,7 +1021,7 @@ sub_816B674: @ 816B674
 	mov r8, r1
 	adds r1, r7, 0
 	mov r2, r8
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	movs r0, 0x2
 	negs r0, r0
 	cmp r6, r0
@@ -1820,7 +1820,7 @@ _0816BD58:
 	movs r1, 0x2
 	negs r1, r1
 	str r1, [r0]
-	ldr r4, =gUnknown_03006310
+	ldr r4, =gMultiuseListMenuTemplate
 	adds r1, r4, 0
 	ldr r0, =gUnknown_085DFF44
 	ldm r0!, {r2,r3,r6}
@@ -2327,7 +2327,7 @@ _0816C186:
 	bl sub_816C110
 	bl sub_816C140
 	bl sub_816BD04
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldr r2, =gUnknown_0203BCB8
 	ldrh r1, [r2, 0x2]
 	ldrh r2, [r2]
@@ -2476,7 +2476,7 @@ sub_816C30C: @ 816C30C
 	ldr r1, =gUnknown_0203BCBA
 	subs r4, r1, 0x2
 	adds r2, r4, 0
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	ldrh r1, [r4, 0x2]
 	ldrh r0, [r4]
 	adds r1, r0
@@ -2492,12 +2492,12 @@ sub_816C30C: @ 816C30C
 	.pool
 _0816C35C:
 	ldrb r0, [r4, 0xA]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	adds r6, r0, 0
 	ldrb r0, [r4, 0xA]
 	ldr r1, =gUnknown_0203BCBA
 	subs r2, r1, 0x2
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	movs r0, 0x2
 	negs r0, r0
 	cmp r6, r0
@@ -2691,18 +2691,18 @@ sub_816C4FC: @ 816C4FC
 	ldrb r0, [r4, 0xA]
 	ldr r1, =gUnknown_0203BCBA
 	subs r2, r1, 0x2
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	b _0816C57E
 	.pool
 _0816C530:
 	ldrb r0, [r4, 0xA]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	adds r6, r0, 0
 	ldrb r0, [r4, 0xA]
 	ldr r1, =gUnknown_0203BCBA
 	subs r4, r1, 0x2
 	adds r2, r4, 0
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	ldr r0, =gUnknown_0203BCC4
 	ldr r0, [r0]
 	movs r1, 0xCD
@@ -2825,7 +2825,7 @@ _0816C622:
 	adds r0, r2
 	movs r1, 0xFF
 	strb r1, [r0]
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldr r2, =gUnknown_0203BCB8
 	ldrh r1, [r2, 0x2]
 	ldrh r2, [r2]
@@ -3363,7 +3363,7 @@ sub_816CB04: @ 816CB04
 	bl sub_816C110
 	bl sub_816C140
 	bl sub_816BD04
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldrh r1, [r4, 0x2]
 	ldrh r2, [r4]
 	bl ListMenuInit

asm/pokemon_summary_screen.s

@@ -2351,7 +2351,7 @@ _081C51D6:
 	thumb_func_start sub_81C51DC
 sub_81C51DC: @ 81C51DC
 	push {lr}
-	bl sub_8121DA0
+	bl ResetVramOamAndBgCntRegs
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
 	ldr r1, =gUnknown_0861F2B4
@@ -2363,7 +2363,7 @@ sub_81C51DC: @ 81C51DC
 	adds r1, 0x4
 	movs r0, 0x2
 	bl SetBgTilemapBuffer
-	bl sub_8121E10
+	bl ResetAllBgsCoordinates
 	movs r0, 0x2
 	bl schedule_bg_copy_tilemap_to_vram
 	movs r1, 0x82
@@ -2460,7 +2460,7 @@ _081C52DC:
 	b _081C5308
 	.pool
 _081C52F0:
-	bl sub_8122328
+	bl LoadListMenuArrowsGfx
 	ldr r0, [r4]
 	ldr r1, =0x00000984
 	adds r0, r1
@@ -2559,7 +2559,7 @@ _081C5382:
 	movs r0, 0x2
 	negs r0, r0
 	str r0, [r1]
-	ldr r2, =gUnknown_03006310
+	ldr r2, =gMultiuseListMenuTemplate
 	adds r1, r2, 0
 	ldr r0, =gUnknown_0861F2C0
 	ldm r0!, {r4,r6,r7}
@@ -2918,7 +2918,7 @@ sub_81C56F8: @ 81C56F8
 	lsls r4, 3
 	ldr r0, =gTasks + 0x8
 	adds r4, r0
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldr r2, =gUnknown_0203CF30
 	ldrh r1, [r2, 0x8]
 	ldrh r2, [r2, 0x6]
@@ -3545,7 +3545,7 @@ _081C5C12:
 	adds r1, r4, 0
 	adds r1, 0x8
 	adds r2, r4, 0x6
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	ldrh r1, [r4, 0x8]
 	ldrh r0, [r4, 0x6]
 	adds r1, r0
@@ -3565,14 +3565,14 @@ _081C5C12:
 	.pool
 _081C5C5C:
 	ldrb r0, [r7]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	adds r6, r0, 0
 	ldrb r0, [r7]
 	ldr r1, =gUnknown_0203CF38
 	mov r8, r1
 	mov r2, r8
 	subs r2, 0x2
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	movs r0, 0x2
 	negs r0, r0
 	cmp r6, r0
@@ -4646,7 +4646,7 @@ sub_81C65CC: @ 81C65CC
 	bl sub_81C5924
 	bl sub_81C59BC
 	bl sub_81C5314
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldrh r1, [r6]
 	ldrh r2, [r7]
 	bl ListMenuInit
@@ -4953,18 +4953,18 @@ sub_81C68B0: @ 81C68B0
 	ldrb r0, [r4]
 	ldr r1, =gUnknown_0203CF38
 	subs r2, r1, 0x2
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	b _081C6940
 	.pool
 _081C68F8:
 	ldrb r0, [r4]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	adds r6, r0, 0
 	ldrb r0, [r4]
 	ldr r4, =gUnknown_0203CF38
 	subs r2, r4, 0x2
 	adds r1, r4, 0
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	movs r0, 0
 	bl sub_81C7028
 	subs r4, 0x8
@@ -5066,7 +5066,7 @@ _081C69A8:
 	strh r0, [r1, 0x6]
 _081C69E0:
 	bl sub_81C5314
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldrh r1, [r7]
 	mov r3, r8
 	ldrh r2, [r3]
@@ -5124,7 +5124,7 @@ sub_81C6A14: @ 81C6A14
 	strh r0, [r1, 0x6]
 _081C6A5E:
 	bl sub_81C5314
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldrh r1, [r5]
 	ldrh r2, [r7]
 	bl ListMenuInit

asm/pokenav.s

@@ -21921,7 +21921,7 @@ sub_81D1DC0: @ 81D1DC0
 	ldr r7, =gUnknown_0203CF4C
 	ldr r0, =gText_Cancel2
 	mov r12, r0
-	ldr r4, =gUnknown_03006310
+	ldr r4, =gMultiuseListMenuTemplate
 	ldr r1, =gUnknown_0203CF48
 	mov r8, r1
 	ldr r2, =sub_81D1E7C
@@ -23376,7 +23376,7 @@ sub_81D28C8: @ 81D28C8
 	push {r4-r7,lr}
 	lsls r1, 16
 	lsrs r4, r1, 16
-	ldr r3, =gUnknown_03006310
+	ldr r3, =gMultiuseListMenuTemplate
 	adds r2, r3, 0
 	ldr r1, =gUnknown_08625548
 	ldm r1!, {r5-r7}

asm/rayquaza_scene.s

@@ -1066,7 +1066,7 @@ sub_81D6FD0: @ 81D6FD0
 	thumb_func_start sub_81D6FE0
 sub_81D6FE0: @ 81D6FE0
 	push {r4,lr}
-	bl sub_8121DA0
+	bl ResetVramOamAndBgCntRegs
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
 	ldr r1, =gUnknown_0862A888
@@ -1088,7 +1088,7 @@ sub_81D6FE0: @ 81D6FE0
 	adds r1, r0
 	movs r0, 0x2
 	bl SetBgTilemapBuffer
-	bl sub_8121E10
+	bl ResetAllBgsCoordinates
 	movs r0, 0
 	bl schedule_bg_copy_tilemap_to_vram
 	movs r0, 0x1
@@ -2758,7 +2758,7 @@ _081D7E08:
 	thumb_func_start sub_81D7E10
 sub_81D7E10: @ 81D7E10
 	push {r4,lr}
-	bl sub_8121DA0
+	bl ResetVramOamAndBgCntRegs
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
 	ldr r1, =gUnknown_0862AA54
@@ -2780,7 +2780,7 @@ sub_81D7E10: @ 81D7E10
 	adds r1, r0
 	movs r0, 0x2
 	bl SetBgTilemapBuffer
-	bl sub_8121E10
+	bl ResetAllBgsCoordinates
 	movs r0, 0
 	bl schedule_bg_copy_tilemap_to_vram
 	movs r0, 0x1
@@ -3292,7 +3292,7 @@ _081D829A:
 	thumb_func_start sub_81D82B0
 sub_81D82B0: @ 81D82B0
 	push {r4,lr}
-	bl sub_8121DA0
+	bl ResetVramOamAndBgCntRegs
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
 	ldr r1, =gUnknown_0862AACC
@@ -3319,7 +3319,7 @@ sub_81D82B0: @ 81D82B0
 	adds r1, r0
 	movs r0, 0x3
 	bl SetBgTilemapBuffer
-	bl sub_8121E10
+	bl ResetAllBgsCoordinates
 	movs r0, 0
 	bl schedule_bg_copy_tilemap_to_vram
 	movs r0, 0x1
@@ -3899,7 +3899,7 @@ _081D8818:
 	thumb_func_start sub_81D8828
 sub_81D8828: @ 81D8828
 	push {r4,lr}
-	bl sub_8121DA0
+	bl ResetVramOamAndBgCntRegs
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
 	ldr r1, =gUnknown_0862AB44
@@ -3926,7 +3926,7 @@ sub_81D8828: @ 81D8828
 	adds r1, r0
 	movs r0, 0x3
 	bl SetBgTilemapBuffer
-	bl sub_8121E10
+	bl ResetAllBgsCoordinates
 	movs r0, 0
 	bl schedule_bg_copy_tilemap_to_vram
 	movs r0, 0x1
@@ -4354,7 +4354,7 @@ _081D8C26:
 	thumb_func_start sub_81D8C38
 sub_81D8C38: @ 81D8C38
 	push {r4,lr}
-	bl sub_8121DA0
+	bl ResetVramOamAndBgCntRegs
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
 	ldr r1, =gUnknown_0862AD08
@@ -4376,7 +4376,7 @@ sub_81D8C38: @ 81D8C38
 	adds r1, r0
 	movs r0, 0x2
 	bl SetBgTilemapBuffer
-	bl sub_8121E10
+	bl ResetAllBgsCoordinates
 	movs r0, 0
 	bl schedule_bg_copy_tilemap_to_vram
 	movs r0, 0x1

asm/roulette.s

@@ -425,8 +425,8 @@ _08140618:
 	bl SetVBlankCallback
 	bl remove_some_task
 	bl SetVBlankHBlankCallbacksToNull
-	bl sub_8121DA0
+	bl ResetVramOamAndBgCntRegs
-	bl sub_8121E10
+	bl ResetAllBgsCoordinates
 	b _081407F8
 _08140630:
 	bl sub_8140388
@@ -3258,8 +3258,8 @@ sub_8141E7C: @ 8141E7C
 	ldr r0, =gSpriteCoordOffsetY
 	strh r4, [r0]
 	strh r4, [r1]
-	bl sub_8121DA0
+	bl ResetVramOamAndBgCntRegs
-	bl sub_8121E10
+	bl ResetAllBgsCoordinates
 	movs r0, 0x50
 	movs r1, 0
 	bl SetGpuReg

asm/script_pokemon_util_80F87D8.s

@@ -1174,8 +1174,8 @@ _080F917A:
 	bx r1
 	thumb_func_end sub_80F9160
 
-	thumb_func_start sp000_heal_pokemon
+	thumb_func_start HealPlayerParty
-sp000_heal_pokemon: @ 80F9180
+HealPlayerParty: @ 80F9180
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -1267,7 +1267,7 @@ _080F922C:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sp000_heal_pokemon
+	thumb_func_end HealPlayerParty
 
 	thumb_func_start ScriptGiveMon
 @ void ScriptGiveMon(s16 species_num, u8 level, int held_item)

asm/shop.s

@@ -409,7 +409,7 @@ _080DFDAC:
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	movs r1, 0
 	movs r2, 0
 	bl ListMenuInit
@@ -601,7 +601,7 @@ _080DFF78:
 	movs r0, 0x2
 	negs r0, r0
 	str r0, [r1, 0x4]
-	ldr r3, =gUnknown_03006310
+	ldr r3, =gMultiuseListMenuTemplate
 	adds r1, r3, 0
 	ldr r0, =gUnknown_08589A48
 	ldm r0!, {r4-r6}
@@ -627,7 +627,7 @@ _080DFFDC:
 _080DFFDE:
 	ldr r0, =gUnknown_02039F70
 	ldr r0, [r0]
-	ldr r1, =gUnknown_03006310
+	ldr r1, =gMultiuseListMenuTemplate
 	ldrh r1, [r1, 0xE]
 	ldr r2, =0x00002004
 	adds r0, r2
@@ -1976,7 +1976,7 @@ Task_BuyMenu: @ 80E0AC8
 	b _080E0C8E
 _080E0AEA:
 	ldrb r0, [r4, 0xE]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	adds r5, r0, 0
 	ldrb r0, [r4, 0xE]
 	ldr r7, =gUnknown_02039F70
@@ -1985,7 +1985,7 @@ _080E0AEA:
 	adds r1, r2, r3
 	subs r3, 0x2
 	adds r2, r3
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	movs r0, 0x2
 	negs r0, r0
 	cmp r5, r0

asm/use_pokeblock.s

@@ -5,350 +5,10 @@
 
 	.text
 
-	thumb_func_start sub_8166204
-sub_8166204: @ 8166204
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	adds r6, r1, 0
-	ldr r4, =gUnknown_0203BCAC
-	ldr r0, =0x0000806c
-	bl AllocZeroed
-	str r0, [r4]
-	ldr r1, =gUnknown_0203BC90
-	ldr r2, =0x00007fd0
-	adds r0, r2
-	str r0, [r1]
-	str r5, [r0, 0x8]
-	str r6, [r0, 0x4]
-	ldr r0, =sub_8166380
-	bl launch_c3_walk_stairs_and_run_once
-	ldr r0, =sub_816631C
-	bl SetMainCallback2
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8166204
 
-	thumb_func_start sub_816624C
-sub_816624C: @ 816624C
-	push {r4,r5,lr}
-	ldr r4, =gUnknown_0203BCAC
-	ldr r0, =0x0000806c
-	bl AllocZeroed
-	str r0, [r4]
-	ldr r5, =gUnknown_0203BC90
-	ldr r1, =0x00007fd0
-	adds r0, r1
-	str r0, [r5]
-	ldr r1, =gUnknown_0203BC98
-	ldr r1, [r1]
-	str r1, [r0, 0x8]
-	ldr r1, =gUnknown_0203BC94
-	ldr r1, [r1]
-	str r1, [r0, 0x4]
-	ldr r4, =gUnknown_0203BC9C
-	ldrb r0, [r4]
-	bl sub_81672E4
-	strb r0, [r4]
-	ldr r5, [r5]
-	movs r1, 0
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x3
-	bls _08166284
-	movs r1, 0x1
-_08166284:
-	adds r0, r5, 0
-	adds r0, 0x56
-	strb r1, [r0]
-	ldr r0, =sub_8166380
-	bl launch_c3_walk_stairs_and_run_once
-	ldr r0, =sub_81662C0
-	bl SetMainCallback2
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_816624C
 
-	thumb_func_start sub_81662C0
+	thumb_func_start sub_8166564
-sub_81662C0: @ 81662C0
+sub_8166564: @ 8166564
-	push {r4,lr}
-	ldr r4, =gUnknown_0203BC90
-	ldr r0, [r4]
-	ldr r0, [r0]
-	bl _call_via_r0
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl UpdatePaletteFade
-	ldr r4, [r4]
-	ldr r1, [r4]
-	ldr r0, =map_warp_consider_1_to_outside_or_stair_or_dive
-	cmp r1, r0
-	bne _081662F0
-	adds r0, r4, 0
-	adds r0, 0x50
-	movs r1, 0
-	strb r1, [r0]
-	ldr r0, =sub_8166304
-	bl SetMainCallback2
-_081662F0:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81662C0
-
-	thumb_func_start sub_8166304
-sub_8166304: @ 8166304
-	push {lr}
-	bl sub_81668F8
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl UpdatePaletteFade
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8166304
-
-	thumb_func_start sub_816631C
-sub_816631C: @ 816631C
-	push {lr}
-	ldr r0, =gUnknown_0203BC90
-	ldr r0, [r0]
-	ldr r0, [r0]
-	bl _call_via_r0
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl RunTextPrinters
-	bl UpdatePaletteFade
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_816631C
-
-	thumb_func_start sub_8166340
-sub_8166340: @ 8166340
-	push {lr}
-	bl LoadOam
-	bl ProcessSpriteCopyRequests
-	bl TransferPlttBuffer
-	ldr r0, =gUnknown_0203BCAC
-	ldr r0, [r0]
-	ldr r1, =0x00007c58
-	adds r0, r1
-	bl sub_81D2108
-	bl sub_80BA0A8
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8166340
-
-	thumb_func_start launch_c3_walk_stairs_and_run_once
-launch_c3_walk_stairs_and_run_once: @ 816636C
-	ldr r1, =gUnknown_0203BC90
-	ldr r1, [r1]
-	str r0, [r1]
-	adds r1, 0x50
-	movs r0, 0
-	strb r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end launch_c3_walk_stairs_and_run_once
-
-	thumb_func_start sub_8166380
-sub_8166380: @ 8166380
-	push {r4,r5,lr}
-	sub sp, 0x4
-	ldr r1, =gUnknown_0203BC90
-	ldr r0, [r1]
-	adds r0, 0x50
-	ldrb r0, [r0]
-	adds r2, r1, 0
-	cmp r0, 0xF
-	bls _08166394
-	b _08166556
-_08166394:
-	lsls r0, 2
-	ldr r1, =_081663A8
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_081663A8:
-	.4byte _081663E8
-	.4byte _0816640C
-	.4byte _08166416
-	.4byte _08166434
-	.4byte _08166464
-	.4byte _08166468
-	.4byte _08166474
-	.4byte _08166484
-	.4byte _08166490
-	.4byte _0816649C
-	.4byte _081664B8
-	.4byte _081664BC
-	.4byte _081664E4
-	.4byte _08166510
-	.4byte _08166528
-	.4byte _08166550
-_081663E8:
-	ldr r2, =gUnknown_0203BCAC
-	ldr r0, [r2]
-	ldr r1, =0x00007b10
-	adds r0, r1
-	movs r1, 0xFF
-	strb r1, [r0]
-	ldr r0, [r2]
-	ldr r2, =0x00007c58
-	adds r0, r2
-	bl sub_81D1ED4
-	b _0816653C
-	.pool
-_0816640C:
-	bl ResetSpriteData
-	bl FreeAllSpritePalettes
-	b _0816653C
-_08166416:
-	movs r0, 0
-	bl SetVBlankCallback
-	movs r0, 0
-	str r0, [sp]
-	movs r1, 0xC0
-	lsls r1, 19
-	ldr r2, =0x05006000
-	mov r0, sp
-	bl CpuSet
-	b _0816653C
-	.pool
-_08166434:
-	movs r0, 0
-	bl ResetBgsAndClearDma3BusyFlags
-	ldr r1, =gUnknown_085DFCCC
-	movs r0, 0
-	movs r2, 0x4
-	bl InitBgsFromTemplates
-	ldr r0, =gUnknown_085DFCDC
-	bl InitWindows
-	bl DeactivateAllTextPrinters
-	movs r0, 0
-	movs r1, 0x97
-	movs r2, 0xE0
-	bl sub_809882C
-	b _0816653C
-	.pool
-_08166464:
-	ldr r1, [r2]
-	b _08166540
-_08166468:
-	bl sub_8168328
-	lsls r0, 24
-	cmp r0, 0
-	bne _08166556
-	b _0816653C
-_08166474:
-	ldr r1, =gKeyRepeatStartDelay
-	movs r0, 0x14
-	strh r0, [r1]
-	bl sub_8167420
-	b _0816653C
-	.pool
-_08166484:
-	bl sub_8167930
-	lsls r0, 24
-	cmp r0, 0
-	bne _08166556
-	b _0816653C
-_08166490:
-	movs r0, 0
-	bl sub_8167608
-	bl sub_8167760
-	b _0816653C
-_0816649C:
-	ldr r0, =gUnknown_0203BCAC
-	ldr r0, [r0]
-	ldr r1, =0x00007b0e
-	adds r0, r1
-	bl sub_81D312C
-	lsls r0, 24
-	cmp r0, 0
-	bne _08166556
-	b _0816653C
-	.pool
-_081664B8:
-	ldr r1, [r2]
-	b _08166540
-_081664BC:
-	ldr r5, =gUnknown_0203BCAC
-	ldr r1, [r5]
-	ldr r4, =0x00007c58
-	adds r0, r1, r4
-	ldr r2, =0x00007c6c
-	adds r1, r2
-	bl sub_81D2754
-	ldr r0, [r5]
-	adds r0, r4
-	bl sub_81D20AC
-	b _0816653C
-	.pool
-_081664E4:
-	ldr r4, =gUnknown_0203BCAC
-	ldr r0, [r4]
-	ldr r1, =0x00007c58
-	adds r0, r1
-	bl sub_81D20BC
-	lsls r0, 24
-	cmp r0, 0
-	bne _08166556
-	ldr r2, [r4]
-	ldr r1, =0x00007c58
-	adds r0, r2, r1
-	adds r1, 0x14
-	adds r2, r1
-	adds r1, r2, 0
-	bl sub_81D1F84
-	b _0816653C
-	.pool
-_08166510:
-	ldr r0, =gUnknown_0203BCAC
-	ldr r0, [r0]
-	ldr r2, =0x00007c58
-	adds r0, r2
-	bl sub_81D2230
-	b _0816653C
-	.pool
-_08166528:
-	movs r0, 0
-	bl PutWindowTilemap
-	movs r0, 0x1
-	bl PutWindowTilemap
-	movs r0, 0
-	movs r1, 0x1
-	bl sub_8167BA0
-_0816653C:
-	ldr r0, =gUnknown_0203BC90
-	ldr r1, [r0]
-_08166540:
-	adds r1, 0x50
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	b _08166556
-	.pool
-_08166550:
-	ldr r0, =map_warp_consider_1_to_outside_or_stair_or_dive
-	bl launch_c3_walk_stairs_and_run_once
-_08166556:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8166380
-
-	thumb_func_start map_warp_consider_1_to_outside_or_stair_or_dive
-map_warp_consider_1_to_outside_or_stair_or_dive: @ 8166564
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r4, =gUnknown_0203BC90
@@ -424,14 +84,14 @@ _081665C0:
 	bl sub_81D3480
 _0816660A:
 	ldr r0, =sub_8166634
-	bl launch_c3_walk_stairs_and_run_once
+	bl sub_816636C
 _08166610:
 	add sp, 0x4
 	pop {r4}
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end map_warp_consider_1_to_outside_or_stair_or_dive
+	thumb_func_end sub_8166564
 
 	thumb_func_start sub_8166634
 sub_8166634: @ 8166634
@@ -567,7 +227,7 @@ _0816675C:
 	.pool
 _08166788:
 	ldr r0, =sub_8166BEC
-	bl launch_c3_walk_stairs_and_run_once
+	bl sub_816636C
 	b _0816680E
 	.pool
 _08166794:
@@ -611,7 +271,7 @@ _081667CC:
 	.pool
 _081667E8:
 	ldr r0, =sub_816681C
-	bl launch_c3_walk_stairs_and_run_once
+	bl sub_816636C
 	b _0816680E
 	.pool
 _081667F4:
@@ -656,7 +316,7 @@ _08166838:
 	adds r0, r1
 	ldrb r0, [r0]
 	bl sub_81672A4
-	ldr r1, =gUnknown_0203BC9C
+	ldr r1, =gPokeblockMonId
 	strb r0, [r1]
 	ldr r1, =gUnknown_0203BC94
 	ldr r2, [r5]
@@ -708,9 +368,9 @@ _08166888:
 	str r5, [r4]
 	bl FreeAllWindowBuffers
 	ldr r1, =gMain
-	ldr r0, =sub_816624C
+	ldr r0, =CB2_ReturnAndChooseMonToGivePokeblock
 	str r0, [r1, 0x8]
-	bl sub_8179D70
+	bl CB2_PreparePokeblockFeedScene
 _081668D4:
 	add sp, 0x4
 	pop {r4,r5}
@@ -752,7 +412,7 @@ _0816693C:
 	ldr r0, [r0]
 	ldr r1, =0x00008041
 	adds r0, r1
-	ldr r1, =gUnknown_0203BC9C
+	ldr r1, =gPokeblockMonId
 	ldrb r0, [r0]
 	ldrb r1, [r1]
 	cmp r0, r1
@@ -837,7 +497,7 @@ _081669F4:
 	adds r0, r1
 	bl sub_81D3464
 	ldr r0, =sub_8166A34
-	bl launch_c3_walk_stairs_and_run_once
+	bl sub_816636C
 	ldr r0, =sub_816631C
 	bl SetMainCallback2
 _08166A18:
@@ -1018,9 +678,9 @@ _08166BB6:
 	bne _08166BDA
 	ldr r0, =gSpecialVar_ItemId
 	ldrb r0, [r0]
-	bl sub_8136F68
+	bl TryClearPokeblock
 	ldr r0, =sub_8166BEC
-	bl launch_c3_walk_stairs_and_run_once
+	bl sub_816636C
 _08166BDA:
 	pop {r4-r6}
 	pop {r0}
@@ -1225,7 +885,7 @@ sub_8166D44: @ 8166D44
 	movs r0, 0x2
 	movs r1, 0x3
 	bl CopyWindowToVram
-	ldr r0, =gUnknown_085DFCFC
+	ldr r0, =sUsePokeblockYesNoWinTemplate
 	movs r1, 0x97
 	movs r2, 0xE
 	movs r3, 0
@@ -1497,7 +1157,7 @@ sub_8166FD4: @ 8166FD4
 	movs r0, 0
 _08166FEC:
 	lsls r0, 16
-	ldr r1, =gUnknown_085DFD04
+	ldr r1, =sContestStatNames
 	lsls r0, r3, 2
 	adds r0, r1
 	ldr r1, [r0]
@@ -1719,7 +1379,7 @@ sub_8167184: @ 8167184
 	adds r0, r3, 0
 	adds r0, 0x6E
 	strh r1, [r0]
-	ldr r0, =gUnknown_0203BC9E
+	ldr r0, =gPokeblockGain
 	movs r1, 0
 	ldrsh r0, [r0, r1]
 	cmp r0, 0

data/data4d.s

@@ -5,60 +5,6 @@
 
 	.section .rodata
 
-gPokeblockFlavorCompatibilityTable:: @ 85B25A0
-	.incbin "baserom.gba", 0x5b25a0, 0x80
-
-gUnknown_085B2620:: @ 85B2620
-	.incbin "baserom.gba", 0x5b2620, 0xc
-
-gPokeblockNames:: @ 85B262C
-	.incbin "baserom.gba", 0x5b262c, 0x3c
-
-gUnknown_085B2668:: @ 85B2668
-	.incbin "baserom.gba", 0x5b2668, 0x30
-
-gUnknown_085B2698:: @ 85B2698
-	.incbin "baserom.gba", 0x5b2698, 0x3
-
-gUnknown_085B269B:: @ 85B269B
-	.incbin "baserom.gba", 0x5b269b, 0x2
-
-gUnknown_085B269D:: @ 85B269D
-	.incbin "baserom.gba", 0x5b269d, 0x2
-
-gUnknown_085B269F:: @ 85B269F
-	.incbin "baserom.gba", 0x5b269f, 0x5
-
-gUnknown_085B26A4:: @ 85B26A4
-	.incbin "baserom.gba", 0x5b26a4, 0x4c
-
-gUnknown_085B26F0:: @ 85B26F0
-	.incbin "baserom.gba", 0x5b26f0, 0x4
-
-gUnknown_085B26F4:: @ 85B26F4
-	.incbin "baserom.gba", 0x5b26f4, 0x8
-
-gUnknown_085B26FC:: @ 85B26FC
-	.incbin "baserom.gba", 0x5b26fc, 0x8
-
-gUnknown_085B2704:: @ 85B2704
-	.incbin "baserom.gba", 0x5b2704, 0x18
-
-gUnknown_085B271C:: @ 85B271C
-	.incbin "baserom.gba", 0x5b271c, 0x4
-
-gUnknown_085B2720:: @ 85B2720
-	.incbin "baserom.gba", 0x5b2720, 0x28
-
-gUnknown_085B2748:: @ 85B2748
-	.incbin "baserom.gba", 0x5b2748, 0x60
-
-gUnknown_085B27A8:: @ 85B27A8
-	.incbin "baserom.gba", 0x5b27a8, 0x8
-
-gUnknown_085B27B0:: @ 85B27B0
-	.incbin "baserom.gba", 0x5b27b0, 0x18
-
 gUnknown_085B27C8:: @ 85B27C8
 	.incbin "baserom.gba", 0x5b27c8, 0x88
 
@@ -797,4 +743,3 @@ gUnknown_085C9A30:: @ 85C9A30
 
 gUnknown_085C9A53:: @ 85C9A53
 	.incbin "baserom.gba", 0x5c9a53, 0x41
-

data/event_scripts.s

@@ -1435,7 +1435,7 @@ OldaleTown_PokemonCenter_1F_EventScript_271993:: @ 8271993
 	waitfieldeffect 25
 	applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_2725AA
 	waitmovement 0
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	return
 
 OldaleTown_PokemonCenter_1F_EventScript_2719B1:: @ 82719B1
@@ -2194,7 +2194,7 @@ SSTidalRooms_EventScript_272083:: @ 8272083
 	fadescreen 1
 	playfanfare BGM_ME_ASA
 	waitfanfare
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	fadescreen 0
 	return
 
@@ -5133,7 +5133,7 @@ SecretBase_RedCave1_EventScript_276286:: @ 8276286
 	call_if 1, SecretBase_RedCave1_EventScript_2762C1
 	compare VAR_RESULT, 2
 	call_if 1, SecretBase_RedCave1_EventScript_2762C5
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	release
 	end
 

data/graphics.s

@@ -880,14 +880,80 @@ gBuyMenuFrame_Tilemap:: @ 8D9B0F0
 gMenuMoneyGfx:: @ 8D9B230
     .incbin "baserom.gba", 0xd9b230, 0x84
 
-gUnknown_08D9B2B4:: @ 8D9B2B4
+gMenuPokeblock_Gfx:: @ 8D9B2B4
 	.incbin "baserom.gba", 0xd9b2b4, 0x1bc
 
-gUnknown_08D9B470:: @ 8D9B470
+gMenuPokeblock_Pal:: @ 8D9B470
-	.incbin "baserom.gba", 0xd9b470, 0x358
+	.incbin "baserom.gba", 0xd9b470, 0x70
 	
-gUnknown_08D9B7C8:: @ 8D9B7C8
+gMenuPokeblockDevice_Gfx:: @ 8D9B4E0
-	.incbin "baserom.gba", 0xd9b7c8, 0x27c
+	.incbin "baserom.gba", 0xd9b4e0, 0x2c0
+	
+gMenuPokeblockDevice_Pal:: @ 8D9B7A0
+	.incbin "baserom.gba", 0xd9b7a0, 0x28
+
+gMenuPokeblock_Tilemap:: @ 8D9B7C8
+	.incbin "baserom.gba", 0xd9b7c8, 0x148
+	
+	.align 2
+gPokeblock_Gfx::
+	.incbin "graphics/pokeblock/pokeblock.4bpp.lz"
+
+	.align 2
+gPokeblockRed_Pal::
+	.incbin "graphics/pokeblock/red.gbapal.lz"
+
+	.align 2
+gPokeblockBlue_Pal::
+	.incbin "graphics/pokeblock/blue.gbapal.lz"
+
+	.align 2
+gPokeblockPink_Pal::
+	.incbin "graphics/pokeblock/pink.gbapal.lz"
+
+	.align 2
+gPokeblockGreen_Pal::
+	.incbin "graphics/pokeblock/green.gbapal.lz"
+
+	.align 2
+gPokeblockYellow_Pal::
+	.incbin "graphics/pokeblock/yellow.gbapal.lz"
+
+	.align 2
+gPokeblockPurple_Pal::
+	.incbin "graphics/pokeblock/purple.gbapal.lz"
+
+	.align 2
+gPokeblockIndigo_Pal::
+	.incbin "graphics/pokeblock/indigo.gbapal.lz"
+
+	.align 2
+gPokeblockBrown_Pal::
+	.incbin "graphics/pokeblock/brown.gbapal.lz"
+
+	.align 2
+gPokeblockLiteBlue_Pal::
+	.incbin "graphics/pokeblock/liteblue.gbapal.lz"
+
+	.align 2
+gPokeblockOlive_Pal::
+	.incbin "graphics/pokeblock/olive.gbapal.lz"
+
+	.align 2
+gPokeblockGray_Pal::
+	.incbin "graphics/pokeblock/gray.gbapal.lz"
+
+	.align 2
+gPokeblockBlack_Pal::
+	.incbin "graphics/pokeblock/black.gbapal.lz"
+
+	.align 2
+gPokeblockWhite_Pal::
+	.incbin "graphics/pokeblock/white.gbapal.lz"
+
+	.align 2
+gPokeblockGold_Pal::
+	.incbin "graphics/pokeblock/gold.gbapal.lz"
 
 gUnknown_08D9BA44:: @ 8D9BA44
 	.incbin "baserom.gba", 0xd9ba44, 0x100

data/pokeblock_feed.s

@@ -1,43 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_085EFEBC:: @ 85EFEBC
-	.incbin "baserom.gba", 0x5efebc, 0x32
-
-gUnknown_085EFEEE:: @ 85EFEEE
-	.incbin "baserom.gba", 0x5efeee, 0x12
-
-gUnknown_085EFF00:: @ 85EFF00
-	.incbin "baserom.gba", 0x5eff00, 0x5fc
-
-gUnknown_085F04FC:: @ 85F04FC
-	.incbin "baserom.gba", 0x5f04fc, 0x54
-
-gUnknown_085F0550:: @ 85F0550
-	.incbin "baserom.gba", 0x5f0550, 0x8
-
-gUnknown_085F0558:: @ 85F0558
-	.incbin "baserom.gba", 0x5f0558, 0x10
-
-gUnknown_085F0568:: @ 85F0568
-	.incbin "baserom.gba", 0x5f0568, 0x48
-
-gUnknown_085F05B0:: @ 85F05B0
-	.incbin "baserom.gba", 0x5f05b0, 0xb4
-
-gUnknown_085F0664:: @ 85F0664
-	.incbin "baserom.gba", 0x5f0664, 0x4
-
-gUnknown_085F0668:: @ 85F0668
-	.incbin "baserom.gba", 0x5f0668, 0x4
-
-gUnknown_085F066C:: @ 85F066C
-	.incbin "baserom.gba", 0x5f066c, 0x34
-
-gUnknown_085F06A0:: @ 85F06A0
-	.incbin "baserom.gba", 0x5f06a0, 0x8
-
-gUnknown_085F06A8:: @ 85F06A8
-	.incbin "baserom.gba", 0x5f06a8, 0x18

data/scripts/cable_club.inc

@@ -449,7 +449,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F60:: @ 8276F60
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	special copy_player_party_to_sav1
 	special copy_bags_and_unk_data_from_save_blocks
 	copyvar VAR_0x4087, VAR_0x8004
@@ -1031,7 +1031,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
 	msgbox OldaleTown_PokemonCenter_2F_Text_27961C, 4
 	closemessage
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x8004, 6
 	copyvar VAR_0x4087, VAR_0x8004
 	call OldaleTown_PokemonCenter_2F_EventScript_277BBE

data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc

@@ -143,7 +143,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630
 	special sub_81A1780
 	playfanfare BGM_ME_ASA
 	waitfanfare
-	special sp000_heal_pokemon
+	special HealPlayerParty
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0
 	setvar VAR_0x8004, 9
@@ -430,14 +430,14 @@ FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C
 	setvar VAR_0x8005, 6
 	setvar VAR_0x8006, 0
 	special sub_81A1780
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x8004, 5
 	setvar VAR_0x8005, 0
 	special sub_8163AC4
 	waitstate
 	setvar VAR_0x8004, 18
 	special sub_81A1780
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x8004, 21
 	special sub_81A1780
 	return

data/scripts/maps/BattleFrontier_BattleArenaLobby.inc

@@ -90,7 +90,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59
 	setvar VAR_0x8004, 8
 	special sub_81A1780
 	special copy_player_party_from_sav1
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 0
 	special sub_81A5238

data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc

@@ -528,7 +528,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440
 	setvar VAR_0x8005, 6
 	setvar VAR_0x8006, 0
 	special sub_81A1780
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 0
 	setvar VAR_0x4009, 1
@@ -537,7 +537,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440
 	setvar VAR_0x4009, 0
 	setvar VAR_0x8004, 17
 	special sub_818E9AC
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x8004, 16
 	special sub_818E9AC
 	return

data/scripts/maps/BattleFrontier_BattleDomeLobby.inc

@@ -95,7 +95,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9
 	setvar VAR_0x8006, 1
 	special sub_818E9AC
 	special copy_player_party_from_sav1
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	goto BattleFrontier_BattleDomeLobby_EventScript_249991
 
 BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940
@@ -118,7 +118,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940
 	setvar VAR_0x8006, 1
 	special sub_818E9AC
 	special copy_player_party_from_sav1
-	special sp000_heal_pokemon
+	special HealPlayerParty
 
 BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991
 	setvar VAR_0x8004, 13
@@ -265,7 +265,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2
 	msgbox BattleFrontier_BattleDomeLobby_Text_24A437, 4
 	closemessage
 	call BattleFrontier_BattleDomeLobby_EventScript_249C6E
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	warp BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR, 255, 23, 6
 	setvar VAR_0x4000, 0
 	waitstate

data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc

@@ -249,7 +249,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7
 	special sub_81A1780
 	playfanfare BGM_ME_ASA
 	waitfanfare
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600
 	fadescreen 1
 	setvar VAR_0x8004, 11

data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc

@@ -89,7 +89,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7
 	setvar VAR_0x8005, 6
 	setvar VAR_0x8006, 0
 	special sub_81A1780
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x8004, 6
 	setvar VAR_0x8005, 0
 	special sub_8163AC4
@@ -225,7 +225,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0
 	setvar VAR_0x8005, 6
 	setvar VAR_0x8006, 0
 	special sub_81A1780
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x8004, 6
 	setvar VAR_0x8005, 0
 	special sub_8163AC4

data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc

@@ -72,7 +72,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A22D, 4
 	playfanfare BGM_ME_ASA
 	waitfanfare
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x8004, 9
 	special sub_81A1780
 	compare VAR_RESULT, 0

data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc

@@ -100,7 +100,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911
 	special sub_81A1780
 	playfanfare BGM_ME_ASA
 	waitfanfare
-	special sp000_heal_pokemon
+	special HealPlayerParty
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A
 	setvar VAR_0x8004, 9
@@ -337,14 +337,14 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7:: @ 824FDF7
 	setvar VAR_0x8005, 6
 	setvar VAR_0x8006, 0
 	special sub_81A1780
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x8004, 4
 	setvar VAR_0x8005, 0
 	special sub_8163AC4
 	waitstate
 	setvar VAR_0x8004, 18
 	special sub_81A1780
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x8004, 21
 	special sub_81A1780
 	return

data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc

@@ -90,7 +90,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1
 	setvar VAR_0x8004, 8
 	special sub_81A1780
 	special copy_player_party_from_sav1
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x8004, 7
 	setvar VAR_0x8005, 0
 	special sub_8195960

data/scripts/maps/BattleFrontier_BattlePikeLobby.inc

@@ -25,7 +25,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707
 	end
 
 BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x8004, 27
 	special sub_81A703C
 	lockall
@@ -77,7 +77,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D
 	copyvar VAR_0x8006, VAR_RESULT
 	special sub_81A703C
 	special copy_player_party_from_sav1
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x8004, 27
 	special sub_81A703C
 	message BattleFrontier_BattlePikeLobby_Text_25C1DF
@@ -108,7 +108,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806
 	setvar VAR_0x8006, 0
 	special sub_81A703C
 	special copy_player_party_from_sav1
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x8004, 27
 	special sub_81A703C
 	setvar VAR_0x8004, 8
@@ -210,7 +210,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
 	setvar VAR_0x8004, 5
 	special sub_81A1780
 	call BattleFrontier_BattlePikeLobby_EventScript_25BA94
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	call BattleFrontier_BattlePikeLobby_EventScript_25BB49
 	warpsilent BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR, 255, 6, 7
 	setvar VAR_0x4000, 0

data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc

@@ -89,7 +89,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285:: @ 825D285
 	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F, 4
 	playfanfare BGM_ME_ASA
 	waitfanfare
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE94, 4
 	closemessage
 	release
@@ -257,7 +257,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D50E:: @ 825D50E
 	waitmessage
 	playfanfare BGM_ME_ASA
 	waitfanfare
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA13, 4
 	closemessage
 	applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798

data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc

@@ -90,7 +90,7 @@ BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66
 	special sub_81A8E7C
 	setvar VAR_0x8004, 14
 	special sub_81A8E7C
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	warpsilent BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13
 	waitstate
 	end

data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc

@@ -70,7 +70,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
 	special copy_player_party_from_sav1
 	setvar VAR_0x8004, 14
 	special sub_81A8E7C
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	message BattleFrontier_BattlePyramidLobby_Text_2519F8
 	waitmessage
 	playse SE_EXPMAX
@@ -100,7 +100,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852
 	special copy_player_party_from_sav1
 	setvar VAR_0x8004, 14
 	special sub_81A8E7C
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	lockall
 	message BattleFrontier_BattlePyramidLobby_Text_251B5A
 	waitmessage
@@ -218,7 +218,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21
 	setvar VAR_0x8006, 0
 	special sub_81A1780
 	setvar VAR_RESULT, 0
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	warp BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1
 	setvar VAR_0x4000, 0
 	waitstate

data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc

@@ -84,7 +84,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_242217, 4
 	playfanfare BGM_ME_ASA
 	waitfanfare
-	special sp000_heal_pokemon
+	special HealPlayerParty
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F:: @ 8241C8F
 	setvar VAR_0x8004, 9
@@ -361,7 +361,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E
 	setvar VAR_0x8005, 6
 	setvar VAR_0x8006, 0
 	special sub_81A1780
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x8004, 0
 	setvar VAR_0x8005, 0
 	special sub_8163AC4
@@ -371,7 +371,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E
 	goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A
 	setvar VAR_0x8004, 18
 	special sub_81A1780
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x8004, 21
 	special sub_81A1780
 

data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc

@@ -161,7 +161,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121
 	call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249514
 	playfanfare BGM_ME_ASA
 	waitfanfare
-	special sp000_heal_pokemon
+	special HealPlayerParty
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143
 	setvar VAR_0x8004, 1

data/scripts/maps/BattleFrontier_BattleTowerLobby.inc

@@ -153,7 +153,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D
 	setvar VAR_0x8004, 8
 	special sub_81A1780
 	special copy_player_party_from_sav1
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x8004, 6
 	setvar VAR_0x8005, 0
 	special sub_8161F74

data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc

@@ -68,7 +68,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41
 	applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6
 	waitmovement 0
 	msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, 4
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x4001, 1
 	releaseall
 	end

data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc

@@ -110,7 +110,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3
 	special sub_81A1780
 	playfanfare BGM_ME_ASA
 	waitfanfare
-	special sp000_heal_pokemon
+	special HealPlayerParty
 
 FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A
 	setvar VAR_0x8004, 1

data/scripts/maps/Route101.inc

@@ -230,7 +230,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16
 	applymovement 2, Route101_Movement_1EBE8D
 	waitmovement 0
 	msgbox Route101_Text_1EBF12, 4
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setflag FLAG_0x2D0
 	clearflag FLAG_0x2D1
 	setflag FLAG_0x2BC

data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc

@@ -54,7 +54,7 @@ SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE
 	msgbox 0x2021fc4, 4
 	waitmessage
 	closemessage
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x8004, 6
 	setvar VAR_0x8005, 0
 	special sub_8163AC4

data/scripts/maps/SlateportCity_BattleTentCorridor.inc

@@ -65,7 +65,7 @@ SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE
 	msgbox SlateportCity_BattleTentCorridor_Text_25A22D, 4
 	playfanfare BGM_ME_ASA
 	waitfanfare
-	special sp000_heal_pokemon
+	special HealPlayerParty
 
 SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D
 	setvar VAR_0x8004, 1

data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc

@@ -78,7 +78,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00
 	fadescreen 1
 	playfanfare BGM_ME_ASA
 	waitfanfare
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	removeobject 1
 	setflag FLAG_0x384
 	compare VAR_0x40DA, 0

data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc

@@ -29,7 +29,7 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68
 	compare VAR_RESULT, 2
 	call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8
 	closemessage
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9
 	waitmovement 0
 	special copy_player_party_from_sav1

data/scripts/maps/TrainerHill_Entrance.inc

@@ -97,7 +97,7 @@ TrainerHill_Entrance_EventScript_2681DA:: @ 82681DA
 	applymovement 255, TrainerHill_Entrance_Movement_268381
 	waitmovement 0
 	setvar VAR_0x40D6, 0
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	releaseall
 
 TrainerHill_Entrance_EventScript_2681EE:: @ 82681EE
@@ -174,7 +174,7 @@ TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8
 	special sp194_trainer_tower
 	setvar VAR_0x40D6, 1
 	setvar VAR_0x4005, 0
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	msgbox TrainerHill_Entrance_Text_26862A, 4
 	setvar VAR_0x8004, 0
 	special sp194_trainer_tower

data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc

@@ -88,7 +88,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8
 	special sub_81A1780
 	playfanfare BGM_ME_ASA
 	waitfanfare
-	special sp000_heal_pokemon
+	special HealPlayerParty
 
 VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C
 	setvar VAR_0x8004, 1

data/scripts/safari_zone.inc

@@ -53,7 +53,7 @@ EventScript_2A4BAC:: @ 82A4BAC
 
 EventScript_2A4BD0:: @ 82A4BD0
 	fadescreen 1
-	special sub_8135908
+	special OpenPokeblockCaseOnFeeder
 	waitstate
 	compare VAR_RESULT, 65535
 	goto_if 5, EventScript_2A4BE2

data/specials.inc

@@ -7,7 +7,7 @@
 .set __special__, 0
         .align 2
 gSpecials:: @ 81DBA64
-	def_special sp000_heal_pokemon
+	def_special HealPlayerParty
 	def_special sub_809D2BC
 	def_special sub_80AF948
 	def_special sub_80AF9F8
@@ -218,7 +218,7 @@ gSpecials:: @ 81DBA64
 	def_special EnterSafariMode
 	def_special ExitSafariMode
 	def_special GetPokeblockFeederInFront
-	def_special sub_8135908
+	def_special OpenPokeblockCaseOnFeeder
 	def_special sub_813793C
 	def_special sub_8137988
 	def_special sub_8137A0C

data/strings.s

@@ -832,46 +832,46 @@ gText_UnkF908Var1Var2:: @ 85E9263
 gText_BerryTag:: @ 85E926B
 	.string "BERRY TAG$"
 
-gUnknown_085E9275:: @ 85E9275
+gText_RedPokeblock:: @ 85E9275
 	.string "RED {POKEBLOCK}$"
 
-gUnknown_085E927F:: @ 85E927F
+gText_BluePokeblock:: @ 85E927F
 	.string "BLUE {POKEBLOCK}$"
 
-gUnknown_085E928A:: @ 85E928A
+gText_PinkPokeblock:: @ 85E928A
 	.string "PINK {POKEBLOCK}$"
 
-gUnknown_085E9295:: @ 85E9295
+gText_GreenPokeblock:: @ 85E9295
 	.string "GREEN {POKEBLOCK}$"
 
-gUnknown_085E92A1:: @ 85E92A1
+gText_YellowPokeblock:: @ 85E92A1
 	.string "YELLOW {POKEBLOCK}$"
 
-gUnknown_085E92AE:: @ 85E92AE
+gText_PurplePokeblock:: @ 85E92AE
 	.string "PURPLE {POKEBLOCK}$"
 
-gUnknown_085E92BB:: @ 85E92BB
+gText_IndigoPokeblock:: @ 85E92BB
 	.string "INDIGO {POKEBLOCK}$"
 
-gUnknown_085E92C8:: @ 85E92C8
+gText_BrownPokeblock:: @ 85E92C8
 	.string "BROWN {POKEBLOCK}$"
 
-gUnknown_085E92D4:: @ 85E92D4
+gText_LiteBluePokeblock:: @ 85E92D4
 	.string "LITEBLUE {POKEBLOCK}$"
 
-gUnknown_085E92E3:: @ 85E92E3
+gText_OlivePokeblock:: @ 85E92E3
 	.string "OLIVE {POKEBLOCK}$"
 
-gUnknown_085E92EF:: @ 85E92EF
+gText_GrayPokeblock:: @ 85E92EF
 	.string "GRAY {POKEBLOCK}$"
 
-gUnknown_085E92FA:: @ 85E92FA
+gText_BlackPokeblock:: @ 85E92FA
 	.string "BLACK {POKEBLOCK}$"
 
-gUnknown_085E9306:: @ 85E9306
+gText_WhitePokeblock:: @ 85E9306
 	.string "WHITE {POKEBLOCK}$"
 
-gUnknown_085E9312:: @ 85E9312
+gText_GoldPokeblock:: @ 85E9312
 	.string "GOLD {POKEBLOCK}$"
 
 gText_Spicy:: @ 85E931D
@@ -3158,19 +3158,19 @@ gText_PokemonCenter:: @ 85EC791
 gText_GetsAPokeBlockQuestion:: @ 85EC7A0
 	.string " gets a {POKEBLOCK}?$"
 
-gUnknown_085EC7AF:: @ 85EC7AF
+gText_Coolness:: @ 85EC7AF
 	.string "Coolness $"
 
-gUnknown_085EC7B9:: @ 85EC7B9
+gText_Beauty3:: @ 85EC7B9
 	.string "Beauty $"
 
-gUnknown_085EC7C1:: @ 85EC7C1
+gText_Cuteness:: @ 85EC7C1
 	.string "Cuteness $"
 
-gUnknown_085EC7CB:: @ 85EC7CB
+gText_Smartness:: @ 85EC7CB
 	.string "Smartness $"
 
-gUnknown_085EC7D6:: @ 85EC7D6
+gText_Toughness:: @ 85EC7D6
 	.string "Toughness $"
 
 gText_WasEnhanced:: @ 85EC7E1

data/use_pokeblock.s

@@ -19,22 +19,32 @@ gUnknown_085DFCB0:: @ 85DFCB0
 	.incbin "baserom.gba", 0x5dfcb0, 0x14
 
 gUnknown_085DFCC4:: @ 85DFCC4
-	.incbin "baserom.gba", 0x5dfcc4, 0x5
+	.byte 0, 4, 3, 2, 1
 
 gUnknown_085DFCC9:: @ 85DFCC9
-	.incbin "baserom.gba", 0x5dfcc9, 0x3
+	.byte 0, 8, 1
 
 gUnknown_085DFCCC:: @ 85DFCCC
-	.incbin "baserom.gba", 0x5dfccc, 0x10
+	.4byte 0x1F8
+	.4byte 0x31E1
+	.4byte 0x4021DF
+	.4byte 0x1172
 
 gUnknown_085DFCDC:: @ 85DFCDC
-	.incbin "baserom.gba", 0x5dfcdc, 0x20
+	window_template 0, 0xD, 1, 0xD, 4, 0xF, 1
+	window_template 0, 0, 0xE, 0xB, 2, 0xF, 0x35
+	window_template 0, 1, 0x11, 0x1C, 2, 0xF, 0x4B
+	window_template_terminator
 
-gUnknown_085DFCFC:: @ 85DFCFC
+sUsePokeblockYesNoWinTemplate:: @ 85DFCFC
-	.incbin "baserom.gba", 0x5dfcfc, 0x8
+	window_template 0, 0x18, 0xB, 5, 4, 0xF, 0x83
 
-gUnknown_085DFD04:: @ 85DFD04
+sContestStatNames:: @ 85DFD04
-	.incbin "baserom.gba", 0x5dfd04, 0x14
+	.4byte gText_Coolness
+	.4byte gText_Toughness
+	.4byte gText_Smartness
+	.4byte gText_Cuteness
+	.4byte gText_Beauty3
 
 gUnknown_085DFD18:: @ 85DFD18
 	.incbin "baserom.gba", 0x5dfd18, 0x8

graphics/pokeblock/black.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 131 74
+41 41 41
+98 98 98
+148 148 148
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/pokeblock/blue.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+106 106 189
+148 148 255
+180 180 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/pokeblock/brown.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+106 0 0
+172 65 65
+197 123 123
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/pokeblock/gold.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 197 49
+246 230 164
+255 238 197
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/pokeblock/gray.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+148 148 148
+189 189 189
+205 205 205
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/pokeblock/green.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 106 0
+49 164 49
+90 230 90
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/pokeblock/indigo.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+139 205 74
+0 0 106
+65 65 172
+123 123 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/pokeblock/liteblue.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+106 139 189
+148 213 255
+180 238 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/pokeblock/olive.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+115 180 106
+148 246 98
+205 255 139
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/pokeblock/pink.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+205 90 172
+255 156 197
+255 197 213
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/pokeblock/purple.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+164 0 164
+197 41 197
+255 131 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/pokeblock/red.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+205 65 24
+255 123 90
+255 180 148
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/pokeblock/white.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 222 222
+238 238 238
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/pokeblock/yellow.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+180 180 49
+246 230 49
+255 255 148
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

include/global.h

@@ -514,11 +514,12 @@ struct RecordMixingDayCareMail
     bool16 holdsItem[DAYCARE_MON_COUNT];
 };
 
-#define MAP_OBJECTS_COUNT  16
+#define POKEBLOCKS_COUNT    40
-#define BERRY_TREES_COUNT  128
+#define MAP_OBJECTS_COUNT   16
-#define FLAGS_COUNT        300
+#define BERRY_TREES_COUNT   128
-#define VARS_COUNT         256
+#define FLAGS_COUNT         300
-#define MAIL_COUNT         16
+#define VARS_COUNT          256
+#define MAIL_COUNT          16
 
 enum
 {
@@ -611,7 +612,7 @@ struct SaveBlock1
     /*0x650*/ struct ItemSlot bagPocket_PokeBalls[16];
     /*0x690*/ struct ItemSlot bagPocket_TMHM[64];
     /*0x790*/ struct ItemSlot bagPocket_Berries[46];
-    /*0x848*/ struct Pokeblock pokeblocks[40];
+    /*0x848*/ struct Pokeblock pokeblocks[POKEBLOCKS_COUNT];
     /*0x988*/ u8 seen1[52];
     /*0x9BC*/ u16 berryBlenderRecords[3];
     /*0x9C2*/ u8 field_9C2[6];

include/graphics.h

@@ -1,10 +1,7 @@
-//
-// Created by scott on 10/21/2017.
-//
-
 #ifndef GUARD_GRAPHICS_H
 #define GUARD_GRAPHICS_H
 
+// interface pokeballs
 extern const u8 gInterfaceGfx_PokeBall[];
 extern const u8 gInterfacePal_PokeBall[];
 extern const u8 gInterfaceGfx_GreatBall[];
@@ -31,6 +28,28 @@ extern const u8 gInterfaceGfx_PremierBall[];
 extern const u8 gInterfacePal_PremierBall[];
 extern const u8 gOpenPokeballGfx[];
 
+// pokeblock
+extern const u8 gMenuPokeblock_Gfx[];
+extern const u8 gMenuPokeblock_Pal[];
+extern const u8 gMenuPokeblock_Tilemap[];
+extern const u8 gMenuPokeblockDevice_Gfx[];
+extern const u8 gMenuPokeblockDevice_Pal[];
+extern const u8 gPokeblockRed_Pal[];
+extern const u8 gPokeblockBlue_Pal[];
+extern const u8 gPokeblockPink_Pal[];
+extern const u8 gPokeblockGreen_Pal[];
+extern const u8 gPokeblockYellow_Pal[];
+extern const u8 gPokeblockPurple_Pal[];
+extern const u8 gPokeblockIndigo_Pal[];
+extern const u8 gPokeblockBrown_Pal[];
+extern const u8 gPokeblockLiteBlue_Pal[];
+extern const u8 gPokeblockOlive_Pal[];
+extern const u8 gPokeblockGray_Pal[];
+extern const u8 gPokeblockBlack_Pal[];
+extern const u8 gPokeblockWhite_Pal[];
+extern const u8 gPokeblockGold_Pal[];
+extern const u8 gPokeblock_Gfx[];
+
 extern const u8 gItemIcon_QuestionMark[];
 extern const u8 gItemIconPalette_QuestionMark[];
 extern const u8 gUnknown_08DB7AA0[];

include/lilycove_lady.h

@@ -7,7 +7,7 @@ void sub_818DA78(void);
 void sub_818DEF4(void);
 void sub_818E564(void);
 void sub_818E570(const struct LilycoveLadyQuiz *quiz);
-bool8 sub_818E704(struct Pokeblock *pokeblock);
+bool8 GivePokeblockToContestLady(struct Pokeblock *pokeblock);
 void sub_818E7E0(u8 *dest1, u8 *dest2);
 void sub_818E81C(u8 *dest);
 void sub_818E848(u8 *dest);

include/list_menu.h

@@ -1,14 +1,17 @@
 #ifndef GUARD_LIST_MENU_H
 #define GUARD_LIST_MENU_H
 
+#define LIST_NOTHING_CHOSEN -1
+#define LIST_B_PRESSED -2
+
 // Exported type declarations
 
 // Exported RAM declarations
 
 struct ListMenuItem
 {
-    const u8 *unk_00;
+    const u8 *name;
-    s32 unk_04;
+    s32 id;
 };
 
 struct ListMenu;
@@ -16,7 +19,7 @@ struct ListMenu;
 struct ListMenuTemplate
 {
     const struct ListMenuItem *items;
-    void (* unk_04)(u32, bool8, struct ListMenu *);
+    void (* moveCursorFunc)(u32, bool8, struct ListMenu *);
     void (* unk_08)(u8, s32, u8);
     u16 totalItems;
     u16 maxShowed;
@@ -32,9 +35,11 @@ struct ListMenuTemplate
     u32 spaceBetweenItems:6; // x20000, x40000, x80000, x100000, x200000, x400000 = x7E0000
     u32 unk_16_7:1; // x800000
     u32 unk_17_0:6; // x1000000, x2000000, x4000000, x8000000, x10000000, x20000000 = x3F000000
+    u32 cursorKind:2; // x40000000, x80000000
 };
 
-struct ListMenu {
+struct ListMenu
+{
     struct ListMenuTemplate _template;
     u16 scrollOffset;
     u16 selectedRow;
@@ -44,13 +49,13 @@ struct ListMenu {
     u8 unk_1F;
 };
 
-extern struct ListMenuTemplate gUnknown_03006310;
+extern struct ListMenuTemplate gMultiuseListMenuTemplate;
 
 // Exported ROM declarations
 
-u8 ListMenuInit(struct ListMenuTemplate *template, u16 a1, u16 a2);
+u8 ListMenuInit(struct ListMenuTemplate *template, u16 cursorPage, u16 cursorPosition);
-s32 ListMenuHandleInput(u8 id);
+s32 ListMenuHandleInputGetItemId(u8 listTaskId);
-void get_coro_args_x18_x1A(u8 a0, u16 *a1, u16 *a2);
+void sub_81AE860(u8 listTaskId, u16 *a1, u16 *a2);
-void sub_81AE6C8(u8 a0, u16 *a1, u16 *a2);
+void sub_81AE6C8(u8 listTaskId, u16 *a1, u16 *a2);
 
 #endif //GUARD_LIST_MENU_H

include/menu.h

@@ -4,6 +4,9 @@
 #include "text.h"
 #include "window.h"
 
+#define MENU_NOTHING_CHOSEN -2
+#define MENU_B_PRESSED -1
+
 struct MenuAction
 {
     const u8 *text;
@@ -32,7 +35,9 @@ void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirs
 s8 ProcessMenuInputNoWrap_(void);
 void do_scheduled_bg_tilemap_copies_to_vram(void);
 void clear_scheduled_bg_copies_to_vram(void);
-void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, s8 speed, const u8 *str);
+void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str);
 void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3);
+void sub_81995E4(u8 windowId, u8 optionsNo, const struct MenuAction *actions, const u8 *actionIds);
+void sub_8197DF8(u8 windowId, bool8 copyToVram);
 
 #endif // GUARD_MENU_H

include/menu_helpers.h

@@ -3,7 +3,8 @@
 
 // Exported type declarations
 
-struct YesNoFuncTable {
+struct YesNoFuncTable
+{
     TaskFunc yesFunc;
     TaskFunc noFunc;
 };
@@ -16,5 +17,15 @@ void sub_812225C(u16 *, u16 *, u8, u8);
 void sub_8122298(u16 *, u16 *, u8, u8, u8);
 void sub_8121F68(u8 taskId, const struct YesNoFuncTable *data);
 bool8 sub_81221AC(void);
+void ResetVramOamAndBgCntRegs(void);
+void SetVBlankHBlankCallbacksToNull(void);
+void ResetAllBgsCoordinates(void);
+bool16 RunTextPrintersRetIsActive(u8 textPrinterId);
+void sub_8122344(void *arg0, u8 arg1);
+void LoadListMenuArrowsGfx(void);
+void sub_81223FC(u8 *a0, u8 count, u8 a2);
+void sub_8122448(u8 *a0, u8 count, u16 x, u16 y);
+void DisplayMessageAndContinueTask(u8 taskId, u8 arg1, u16 arg2, u8 arg3, u8 arg4, u8 textSpeed, const u8 *string, void *taskFunc);
+void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *template, u8 arg2, u8 arg3, u8 arg4, u16 tileStart, u8 palette, const struct YesNoFuncTable *yesNo);
 
 #endif //GUARD_MENU_HELPERS_H

include/party_menu.h

@@ -1,7 +1,8 @@
 #ifndef GUARD_PARTY_MENU_H
 #define GUARD_PARTY_MENU_H
 
-enum {
+enum
+{
     AILMENT_NONE,
     AILMENT_PSN,
     AILMENT_PRZ,
@@ -14,5 +15,6 @@ bool8 pokemon_has_move(struct Pokemon *, u16);
 void sub_81B58A8(void);
 void DoWallyTutorialBagMenu(void);
 u8 pokemon_ailments_get_primary(u32 status);
+u8 *GetMonNickname(struct Pokemon *mon, u8 *dst);
 
 #endif // GUARD_PARTY_MENU_H

include/pokeblock.h

@@ -1,6 +1,9 @@
 #ifndef GUARD_POKEBLOCK_H
 #define GUARD_POKEBLOCK_H
 
+#define GFX_TAG_POKEBLOCK       14818
+#define GFX_TAG_POKEBLOCK_CASE  14800
+
 enum
 {
     PBLOCK_CLR_BLACK,
@@ -22,12 +25,44 @@ enum
     PBLOCK_FEEL,
 };
 
+enum
+{
+    PBLOCK_CASE_FIELD,
+    PBLOCK_CASE_BATTLE,
+    PBLOCK_CASE_FEEDER,
+    PBLOCK_CASE_GIVE
+};
+
+// use pokeblock
+extern u8 gPokeblockMonId;
+extern s16 gPokeblockGain;
+
+void ChooseMonToGivePokeblock(struct Pokeblock *pokeblock, void (*callback)(void));
+
+// pokeblock feed
+void CB2_PreparePokeblockFeedScene(void);
+
+// pokeblock
+extern const s8 gPokeblockFlavorCompatibilityTable[];
+extern const u8 *const gPokeblockNames[];
+extern const struct CompressedSpriteSheet gPokeblockCase_SpriteSheet;
+extern const struct CompressedSpritePalette gPokeblockCase_SpritePal;
+
+void OpenPokeblockCase(u8 caseId, void (*callback)(void));
+void OpenPokeblockCaseInBattle(void);
+void OpenPokeblockCaseOnFeeder(void);
+void ResetPokeblockScrollPositions(void);
+u8 CreatePokeblockCaseSprite(s16 x, s16 y, u8 subpriority);
 void ClearPokeblocks(void);
-s8 GetFirstFreePokeblockSlot(void);
-bool32 AddPokeblock(struct Pokeblock *pokeblock);
 u8 GetHighestPokeblocksFlavorLevel(const struct Pokeblock *pokeblock);
 u8 GetPokeblocksFeel(const struct Pokeblock *pokeblock);
+s8 GetFirstFreePokeblockSlot(void);
+bool32 AddPokeblock(const struct Pokeblock *pokeblock);
+bool32 TryClearPokeblock(u8 pkblId);
+s16 GetPokeblockData(const struct Pokeblock *pokeblock, u8 field);
+s16 PokeblockGetGain(u8 nature, const struct Pokeblock *pokeblock);
+void PokeblockCopyName(const struct Pokeblock *pokeblock, u8 *dest);
+bool8 CopyMonFavoritePokeblockName(u8 nature, u8 *dest);
 u8 GetPokeblocksFlavor(const struct Pokeblock *pokeblock);
-s16 PokeblockGetGain(u8, const struct Pokeblock *);
 
 #endif // GUARD_POKEBLOCK_H

include/pokenav.h

@@ -2,6 +2,16 @@
 #define GUARD_POKENAV_H
 
 bool8 sub_81D5C18(void);
+bool8 sub_81D20BC(void *arg0);
+bool8 sub_81D312C(void *arg0);
+void sub_81D1ED4(void *arg0);
+void sub_81D2108(void *arg0);
+void sub_81D20AC(void *arg0);
+void sub_81D2230(void *arg0);
+void sub_81D3464(void *arg0);
+void sub_81D3480(void *arg0, u8 arg1);
+void sub_81D2754(void *arg0, void *arg1);
+void sub_81D1F84(void *arg0, void *arg1, void *arg2);
 const u8 *sub_81D62AC(void);
 
 #endif //GUARD_POKENAV_H

include/rom6.h

@@ -1,7 +1,7 @@
 #ifndef GUARD_ROM6_H
 #define GUARD_ROM6_H
 
-void sub_81357FC(u8, void(void));
+void OpenPokeblockCase(u8, void(void));
 u8 GetLeadMonIndex(void);
 u8 GetSSTidalLocation(u8 *grp, u8 *num, s16 *x, s16 *y);
 void sub_813BADC(bool8);

include/strings.h

@@ -1,45 +1,62 @@
 #ifndef GUARD_STRINGS_H
 #define GUARD_STRINGS_H
 
-// Exported type declarations
-
-// Exported RAM declarations
-
-// Exported ROM declarations
-
 extern const u8 gText_FromSpace[];
+
 extern const u8 gText_Lv50[];
 extern const u8 gText_OpenLevel[];
+
 extern const u8 gText_Mom[];
 extern const u8 gText_Dad[];
+
 extern const u8 gText_Cool[];
 extern const u8 gText_Beauty[];
 extern const u8 gText_Cute[];
 extern const u8 gText_Smart[];
 extern const u8 gText_Tough[];
+
 extern const u8 gText_Single[];
 extern const u8 gText_Double[];
+
+extern const u8 gText_Spicy[];
+extern const u8 gText_Dry[];
+extern const u8 gText_Sweet[];
+extern const u8 gText_Bitter[];
+extern const u8 gText_Sour[];
+
+extern const u8 gText_StowCase[];
+extern const u8 gText_LvVar1[];
+
 extern const u8 gText_Spicy2[];
 extern const u8 gText_Dry2[];
 extern const u8 gText_Sweet2[];
 extern const u8 gText_Bitter2[];
 extern const u8 gText_Sour2[];
+
 extern const u8 gText_Excellent[];
 extern const u8 gText_VeryGood[];
 extern const u8 gText_Good[];
 extern const u8 gText_SoSo[];
 extern const u8 gText_Bad[];
 extern const u8 gText_TheWorst[];
+
 extern const u8 gText_Slots[];
 extern const u8 gText_Roulette[];
 extern const u8 gText_Jackpot[];
+
 extern const u8 gText_First[];
 extern const u8 gText_Second[];
 extern const u8 gText_Third[];
+
 extern const u8 gText_NoDecorations[];
 extern const u8 gText_NoDecorationsInUse[];
+
 extern const u8 gText_Exit[];
 extern const u8 gText_Cancel[];
+
+extern const u8 gText_ThrowAwayVar1[];
+extern const u8 gText_Var1ThrownAway[];
+
 extern const u8 gText_Color161Shadow161[];
 extern const u8 gText_GoBackPrevMenu[];
 extern const u8 gText_CantPlaceInRoom[];
@@ -56,12 +73,14 @@ extern const u8 gText_NoDecorationHere[];
 extern const u8 gText_DecorationWillBeDiscarded[];
 extern const u8 gText_CantThrowAwayInUse[];
 extern const u8 gText_DecorationThrownAway[];
+
 extern const u8 gText_Desk[];
 extern const u8 gText_Chair[];
 extern const u8 gText_Plant[];
 extern const u8 gText_Ornament[];
 extern const u8 gText_Mat[];
 extern const u8 gText_Poster[];
+
 extern const u8 gText_PutOutSelectedDecorItem[];
 extern const u8 gText_StoreChosenDecorInPC[];
 extern const u8 gText_ThrowAwayUnwantedDecors[];
@@ -92,4 +111,30 @@ extern const u8 gText_Draw[];
 extern const u8 gText_Loss[];
 extern const u8 gText_Win[];
 
+extern const u8 gText_Var1AteTheVar2[];
+extern const u8 gText_Var1HappilyAteVar2[];
+extern const u8 gText_Var1DisdainfullyAteVar2[];
+
+extern const u8 gText_RedPokeblock[];
+extern const u8 gText_BluePokeblock[];
+extern const u8 gText_PinkPokeblock[];
+extern const u8 gText_GreenPokeblock[];
+extern const u8 gText_YellowPokeblock[];
+extern const u8 gText_PurplePokeblock[];
+extern const u8 gText_IndigoPokeblock[];
+extern const u8 gText_BrownPokeblock[];
+extern const u8 gText_LiteBluePokeblock[];
+extern const u8 gText_OlivePokeblock[];
+extern const u8 gText_GrayPokeblock[];
+extern const u8 gText_BlackPokeblock[];
+extern const u8 gText_WhitePokeblock[];
+extern const u8 gText_GoldPokeblock[];
+
+extern const u8 gMenuText_Use[];
+extern const u8 gMenuText_Toss[];
+extern const u8 gMenuText_Give[];
+extern const u8 gMenuText_Give2[];
+
+extern const u8 gText_Cancel2[];
+
 #endif //GUARD_STRINGS_H

include/text_window.h

@@ -3,8 +3,8 @@
 
 struct TilesPal
 {
-    u32* tiles;
+    u32 *tiles;
-    u16* pal;
+    u16 *pal;
 };
 
 const struct TilesPal* sub_8098758(u8 id);

ld_script.txt

@@ -179,6 +179,8 @@ SECTIONS {
         src/starter_choose.o(.text);
         src/wallclock.o(.text);
         asm/rom6.o(.text);
+        src/pokeblock.o(.text);
+        asm/rom_81370FC.o(.text);
         asm/battle_records.o(.text);
         asm/pokedex_area_screen.o(.text);
         src/evolution_scene.o(.text);
@@ -207,6 +209,7 @@ SECTIONS {
         src/decoration_inventory.o(.text);
         src/roamer.o(.text);
         asm/battle_tower.o(.text);
+        src/use_pokeblock.o(.text);
         asm/use_pokeblock.o(.text);
         src/battle_controller_wally.o(.text);
         asm/player_pc.o(.text);
@@ -222,7 +225,7 @@ SECTIONS {
         asm/mystery_event_menu.o(.text);
         src/save_failed_screen.o(.text);
         src/braille_puzzles.o(.text);
-        asm/pokeblock_feed.o(.text);
+        src/pokeblock_feed.o(.text);
         src/clear_save_data_screen.o(.text);
         asm/intro_credits_graphics.o(.text);
         src/evolution_graphics.o(.text);
@@ -424,7 +427,8 @@ SECTIONS {
         data/data4.o(.rodata);
         data/starter_choose.o(.rodata);
         src/wallclock.o(.rodata);
-        data/data4c.o(.rodata);
+        src/pokeblock.o(.rodata);
+        data/data4d.o(.rodata);
         src/battle_controller_link_partner.o(.rodata);
         src/battle_message.o(.rodata);
         data/cable_car.o(.rodata);
@@ -436,6 +440,7 @@ SECTIONS {
         data/learn_move.o(.rodata);
         src/roamer.o(.rodata);
         data/battle_tower.o(.rodata);
+        src/use_pokeblock.o(.rodata);
         data/use_pokeblock.o(.rodata);
         src/battle_controller_wally.o(.rodata);
         data/player_pc.o(.rodata);
@@ -451,7 +456,7 @@ SECTIONS {
         data/mystery_event_menu.o(.rodata);
         src/save_failed_screen.o(.rodata);
         data/braille_puzzles.o(.rodata);
-        data/pokeblock_feed.o(.rodata);
+        src/pokeblock_feed.o(.rodata);
         src/clear_save_data_screen.o(.rodata);
         data/intro_credits_graphics.o(.rodata);
         src/evolution_graphics.o(.rodata);

src/battle_controller_safari.c

@@ -19,6 +19,7 @@
 #include "reshow_battle_screen.h"
 #include "pokeball.h"
 #include "data2.h"
+#include "pokeblock.h"
 
 extern u32 gBattleExecBuffer;
 extern u8 gActiveBank;
@@ -291,13 +292,13 @@ static void CompleteOnSpecialAnimDone(void)
         SafariBufferExecCompleted();
 }
 
-static void OpenPokeblockCase(void)
+static void SafariOpenPokeblockCase(void)
 {
     if (!gPaletteFade.active)
     {
         gBattleBankFunc[gActiveBank] = CompleteWhenChosePokeblock;
         FreeAllWindowBuffers();
-        sub_81358F4();
+        OpenPokeblockCaseInBattle();
     }
 }
 
@@ -497,7 +498,7 @@ static void SafariHandleChooseItem(void)
     s32 i;
 
     BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
-    gBattleBankFunc[gActiveBank] = OpenPokeblockCase;
+    gBattleBankFunc[gActiveBank] = SafariOpenPokeblockCase;
     gBankInMenu = gActiveBank;
 }
 

src/battle_interface.c

@@ -177,7 +177,6 @@ extern const u16 gBattleInterface_BallDisplayPal[];
 extern const u8 gHealthboxElementsGfxTable[][32];
 
 // functions
-extern void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, s8 speed, const u8 *str); // menu.h
 extern void LoadBattleBarGfx(u8 arg0);
 
 // this file's functions

src/berry_blender.c

@@ -134,8 +134,6 @@ extern u8 gInGameOpponentsNo;
 extern u8 gUnknown_020322D5;
 extern u8 gResultsWindowId;
 
-extern const u8 * const gPokeblockNames[];
-
 // graphics
 extern const u8 gBerryBlenderArrowTiles[];
 extern const u8 gBerryBlenderStartTiles[];

src/daycare.c

@@ -40,7 +40,7 @@ extern const u8 gDaycareText_PlayOther[];
 
 extern u8 GetCursorSelectionMonId(void);
 extern u16 ItemIdToBattleMoveId(u16);
-extern s32 ListMenuHandleInput(u8);
+extern s32 ListMenuHandleInputGetItemId(u8);
 extern void sub_81AE6C8(u8, u16*, u16*);
 extern void sub_819746C(u8, bool8);
 extern void sub_81973FC(u8, bool8);
@@ -75,7 +75,7 @@ static const struct ListMenuItem sLevelMenuItems[] =
 static const struct ListMenuTemplate sDaycareListMenuLevelTemplate =
 {
     .items = sLevelMenuItems,
-    .unk_04 = sub_81AF078,
+    .moveCursorFunc = sub_81AF078,
     .unk_08 = DaycarePrintMonInfo,
     .totalItems = 3,
     .maxShowed = 3,
@@ -90,7 +90,8 @@ static const struct ListMenuTemplate sDaycareListMenuLevelTemplate =
     .unk_16_0 = TRUE,
     .spaceBetweenItems = 0,
     .unk_16_7 = FALSE,
-    .unk_17_0 = 1
+    .unk_17_0 = 1,
+    .cursorKind = 0
 };
 
 static const u8 *const sCompatibilityMessages[] =
@@ -1256,7 +1257,7 @@ static void DaycarePrintMonInfo(u8 windowId, s32 daycareSlotId, u8 y)
 
 static void Task_HandleDaycareLevelMenuInput(u8 taskId)
 {
-    u32 var = ListMenuHandleInput(gTasks[taskId].tMenuListTaskId);
+    u32 var = ListMenuHandleInputGetItemId(gTasks[taskId].tMenuListTaskId);
 
     if (gMain.newKeys & A_BUTTON)
     {

src/decoration.c

@@ -792,17 +792,17 @@ void sub_8127330(u8 taskId)
     for (i = 0; i < sDecorPCBuffer->unk_520 - 1; i ++)
     {
         sub_8127454(sDecorPCBuffer->names[i], gCurDecorInventoryItems[i]);
-        sDecorPCBuffer->items[i].unk_00 = sDecorPCBuffer->names[i];
+        sDecorPCBuffer->items[i].name = sDecorPCBuffer->names[i];
-        sDecorPCBuffer->items[i].unk_04 = i;
+        sDecorPCBuffer->items[i].id = i;
     }
     StringCopy(sDecorPCBuffer->names[i], gText_Cancel);
-    sDecorPCBuffer->items[i].unk_00 = sDecorPCBuffer->names[i];
+    sDecorPCBuffer->items[i].name = sDecorPCBuffer->names[i];
-    sDecorPCBuffer->items[i].unk_04 = -2;
+    sDecorPCBuffer->items[i].id = -2;
-    gUnknown_03006310 = gUnknown_085A6BD0;
+    gMultiuseListMenuTemplate = gUnknown_085A6BD0;
-    gUnknown_03006310.unk_10 = sDecorMenuWindowIndices[1];
+    gMultiuseListMenuTemplate.unk_10 = sDecorMenuWindowIndices[1];
-    gUnknown_03006310.totalItems = sDecorPCBuffer->unk_520;
+    gMultiuseListMenuTemplate.totalItems = sDecorPCBuffer->unk_520;
-    gUnknown_03006310.items = sDecorPCBuffer->items;
+    gMultiuseListMenuTemplate.items = sDecorPCBuffer->items;
-    gUnknown_03006310.maxShowed = sDecorPCBuffer->unk_521;
+    gMultiuseListMenuTemplate.maxShowed = sDecorPCBuffer->unk_521;
 }
 
 void sub_8127454(u8 *dest, u16 decorId)
@@ -871,7 +871,7 @@ void sub_812759C(u8 taskId)
     sub_81272C8();
     sub_81272F8();
     sub_8127330(taskId);
-    data[13] = ListMenuInit(&gUnknown_03006310, sSecretBasePCSelectDecorPageNo, sSecretBasePCSelectDecorLineNo);
+    data[13] = ListMenuInit(&gMultiuseListMenuTemplate, sSecretBasePCSelectDecorPageNo, sSecretBasePCSelectDecorLineNo);
     sub_8127500();
 }
 
@@ -889,8 +889,8 @@ void sub_812764C(u8 taskId)
     data = gTasks[taskId].data;
     if (!gPaletteFade.active)
     {
-        input = ListMenuHandleInput(data[13]);
+        input = ListMenuHandleInputGetItemId(data[13]);
-        get_coro_args_x18_x1A(data[13], &sSecretBasePCSelectDecorPageNo, &sSecretBasePCSelectDecorLineNo);
+        sub_81AE860(data[13], &sSecretBasePCSelectDecorPageNo, &sSecretBasePCSelectDecorLineNo);
         switch (input)
         {
             case -1:

src/lilycove_lady.c

@@ -943,7 +943,7 @@ static void sub_818E6B0(u8 sheen)
     }
 }
 
-bool8 sub_818E704(struct Pokeblock *pokeblock)
+bool8 GivePokeblockToContestLady(struct Pokeblock *pokeblock)
 {
     u8 sheen;
     bool8 response;
@@ -1079,7 +1079,7 @@ void sub_818E914(void)
 
 void sub_818E92C(void)
 {
-    sub_81357FC(3, c2_exit_to_overworld_2_switch);
+    OpenPokeblockCase(3, c2_exit_to_overworld_2_switch);
 }
 
 void sub_818E940(void)

src/new_game.c

@@ -33,7 +33,6 @@ extern void Overworld_SetWarpDestination(s8 mapBank, s8 mapNo, s8 warpNo, s8 xPo
 extern void warp_in(void);
 extern void sub_80BB358(void);
 extern void ResetBagScrollPositions(void);
-extern void sub_813624C(void); // clears something pokeblock related
 extern void ResetPokedex(void);
 extern void sub_8084400(void);
 extern void ClearMailData(void);
@@ -148,7 +147,7 @@ void sub_808447C(void)
     ZeroPlayerPartyMons();
     ZeroEnemyPartyMons();
     ResetBagScrollPositions();
-    sub_813624C();
+    ResetPokeblockScrollPositions();
 }
 
 void NewGameInitData(void)

src/pokemon_3.c

@@ -21,6 +21,7 @@
 #include "constants/abilities.h"
 #include "pokemon_animation.h"
 #include "pokedex.h"
+#include "pokeblock.h"
 
 extern struct BattlePokemon gBattleMons[4];
 extern struct BattleEnigmaBerry gEnigmaBerries[4];
@@ -58,7 +59,6 @@ extern const u8 gText_PkmnsXPreventsSwitching[];
 extern const struct CompressedSpritePalette gMonPaletteTable[];
 extern const struct CompressedSpritePalette gMonShinyPaletteTable[];
 extern const u16 gHMMoves[];
-extern const s8 gPokeblockFlavorCompatibilityTable[];
 extern const u8 gMonAnimationDelayTable[];
 extern const u8 gMonFrontAnimIdsTable[];
 
@@ -1298,21 +1298,21 @@ bool8 IsPokeSpriteNotFlipped(u16 species)
     return gBaseStats[species].noFlip;
 }
 
-s8 GetMonFlavorRelation(struct Pokemon *mon, u8 a2)
+s8 GetMonFlavorRelation(struct Pokemon *mon, u8 flavor)
 {
     u8 nature = GetNature(mon);
-    return gPokeblockFlavorCompatibilityTable[nature * 5 + a2];
+    return gPokeblockFlavorCompatibilityTable[nature * 5 + flavor];
 }
 
-s8 GetFlavorRelationByPersonality(u32 personality, u8 a2)
+s8 GetFlavorRelationByPersonality(u32 personality, u8 flavor)
 {
     u8 nature = GetNatureFromPersonality(personality);
-    return gPokeblockFlavorCompatibilityTable[nature * 5 + a2];
+    return gPokeblockFlavorCompatibilityTable[nature * 5 + flavor];
 }
 
 bool8 IsTradedMon(struct Pokemon *mon)
 {
-    u8 otName[8];
+    u8 otName[OT_NAME_LENGTH + 1];
     u32 otId;
     GetMonData(mon, MON_DATA_OT_NAME, otName);
     otId = GetMonData(mon, MON_DATA_OT_ID, 0);

src/pokemon_summary_screen.c

@@ -73,7 +73,7 @@ extern void do_scheduled_bg_tilemap_copies_to_vram(void);
 extern u8 sub_81221EC();
 extern u8 sub_81221AC();
 extern void SetVBlankHBlankCallbacksToNull();
-extern void sub_8121DA0();
+extern void ResetVramOamAndBgCntRegs();
 extern void clear_scheduled_bg_copies_to_vram();
 extern void remove_some_task();
 extern void ResetBgsAndClearDma3BusyFlags(u32 leftoverFireRedLeafGreenVariable);
@@ -193,7 +193,7 @@ void sub_81C4A88();
 void sub_81C4280();
 void sub_81C0510(u8 taskId);
 void sub_81C171C(u8 taskId);
-void sub_8121E10();
+void ResetAllBgsCoordinates();
 u8 sub_81B205C(struct Pokemon* a);
 void sub_81C1DA4(u16 a, s16 b);
 void sub_81C1EFC(u16 a, s16 b, u16 c);
@@ -450,7 +450,7 @@ bool8 sub_81BFB10(void)
     {
     case 0:
         SetVBlankHBlankCallbacksToNull();
-        sub_8121DA0();
+        ResetVramOamAndBgCntRegs();
         clear_scheduled_bg_copies_to_vram();
         gMain.state++;
         break;
@@ -578,7 +578,7 @@ void sub_81BFE24()
     SetBgTilemapBuffer(1, &gUnknown_0203CF1C->unkTilemap2);
     SetBgTilemapBuffer(2, &gUnknown_0203CF1C->unkTilemap1);
     SetBgTilemapBuffer(3, &gUnknown_0203CF1C->unkTilemap0);
-    sub_8121E10();
+    ResetAllBgsCoordinates();
     schedule_bg_copy_tilemap_to_vram(1);
     schedule_bg_copy_tilemap_to_vram(2);
     schedule_bg_copy_tilemap_to_vram(3);

src/safari_zone.c

@@ -5,6 +5,7 @@
 #include "main.h"
 #include "battle.h"
 #include "string_util.h"
+#include "pokeblock.h"
 
 struct PokeblockFeeder
 {
@@ -24,7 +25,6 @@ extern u8 EventScript_2A4B8A[];
 extern u8 EventScript_2A4B6F[];
 extern u8 EventScript_2A4B4C[];
 extern u8 EventScript_2A4B9B[];
-extern const u8* const gPokeblockNames[];
 
 extern void sub_80EE44C(u8, u8);
 extern void IncrementGameStat(u8 index);

src/secret_base.c

@@ -1082,13 +1082,13 @@ void game_continue(u8 taskId)
         if (sub_80E9878(i))
         {
             sub_80E9780(gUnknown_0203A020->names[count], i);
-            gUnknown_0203A020->items[count].unk_00 = gUnknown_0203A020->names[count];
+            gUnknown_0203A020->items[count].name = gUnknown_0203A020->names[count];
-            gUnknown_0203A020->items[count].unk_04 = i;
+            gUnknown_0203A020->items[count].id = i;
             count ++;
         }
     }
-    gUnknown_0203A020->items[count].unk_00 = gText_Cancel;
+    gUnknown_0203A020->items[count].name = gText_Cancel;
-    gUnknown_0203A020->items[count].unk_04 = -2;
+    gUnknown_0203A020->items[count].id = -2;
     data[0] = count + 1;
     if (data[0] < 8)
     {
@@ -1098,11 +1098,11 @@ void game_continue(u8 taskId)
     {
         data[3] = 8;
     }
-    gUnknown_03006310 = gUnknown_0858D07C;
+    gMultiuseListMenuTemplate = gUnknown_0858D07C;
-    gUnknown_03006310.unk_10 = data[6];
+    gMultiuseListMenuTemplate.unk_10 = data[6];
-    gUnknown_03006310.totalItems = data[0];
+    gMultiuseListMenuTemplate.totalItems = data[0];
-    gUnknown_03006310.items = gUnknown_0203A020->items;
+    gMultiuseListMenuTemplate.items = gUnknown_0203A020->items;
-    gUnknown_03006310.maxShowed = data[3];
+    gMultiuseListMenuTemplate.maxShowed = data[3];
 }
 
 void sub_80E9DEC(u32 a0, bool8 flag, struct ListMenu *menu)
@@ -1119,7 +1119,7 @@ void sub_80E9E00(u8 taskId)
 
     data = gTasks[taskId].data;
     SetStandardWindowBorderStyle(data[6], 0);
-    data[5] = ListMenuInit(&gUnknown_03006310, data[2], data[1]);
+    data[5] = ListMenuInit(&gMultiuseListMenuTemplate, data[2], data[1]);
     sub_80E9E44(taskId);
     schedule_bg_copy_tilemap_to_vram(0);
 }
@@ -1138,8 +1138,8 @@ void sub_80E9E90(u8 taskId)
     s32 input;
 
     data = gTasks[taskId].data;
-    input = ListMenuHandleInput(data[5]);
+    input = ListMenuHandleInputGetItemId(data[5]);
-    get_coro_args_x18_x1A(data[5], &data[2], &data[1]);
+    sub_81AE860(data[5], &data[2], &data[1]);
     switch (input)
     {
         case -1:

src/use_pokeblock.c

@@ -0,0 +1,230 @@
+#include "global.h"
+#include "main.h"
+#include "pokeblock.h"
+#include "malloc.h"
+#include "palette.h"
+#include "pokenav.h"
+#include "unknown_task.h"
+#include "text.h"
+#include "bg.h"
+#include "window.h"
+#include "text_window.h"
+
+struct UsePokeblockSubStruct
+{
+    void (*field_0)(void);
+    void (*callback)(void);
+    struct Pokeblock *pokeblock;
+    struct Pokemon *pokemon;
+    u8 stringBuffer[0x40];
+    u8 field_50;
+    u8 field_51;
+    u8 field_52;
+    u8 field_53;
+    u8 field_54;
+    u8 field_55;
+    u8 field_56;
+    u8 field_57[5];
+    u8 field_5c[5];
+    u8 field_61[5];
+    s16 field_66[5];
+};
+
+struct UsePokeblockStruct
+{
+    u8 field_0[0x7C58];
+    u8 field_7C58[0x378];
+    struct UsePokeblockSubStruct info;
+};
+
+extern u16 gKeyRepeatStartDelay;
+
+// this file's functions
+void sub_816636C(void (*func)(void));
+void sub_8166380(void);
+void sub_816631C(void);
+void sub_81662C0(void);
+void sub_8166564(void);
+void sub_8166304(void);
+void sub_81668F8(void);
+void sub_8167420(void);
+void sub_8167760(void);
+u8 sub_81672E4(u8 arg0);
+bool8 sub_8168328(void);
+bool8 sub_8167930(void);
+void sub_8167608(u8 arg0);
+void sub_8167BA0(u16 arg0, u8 copyToVramMode);
+
+extern const struct BgTemplate gUnknown_085DFCCC[4];
+extern const struct WindowTemplate gUnknown_085DFCDC[];
+
+// ram variables
+EWRAM_DATA struct UsePokeblockSubStruct *gUnknown_0203BC90 = NULL;
+EWRAM_DATA void (*gUnknown_0203BC94)(void) = NULL;
+EWRAM_DATA struct Pokeblock *gUnknown_0203BC98 = NULL;
+EWRAM_DATA u8 gPokeblockMonId = 0;
+EWRAM_DATA s16 gPokeblockGain = 0;
+EWRAM_DATA void *gUnknown_0203BCA0 = NULL;
+EWRAM_DATA void *gUnknown_0203BCA4 = NULL;
+EWRAM_DATA void *gUnknown_0203BCA8 = NULL;
+EWRAM_DATA struct UsePokeblockStruct *gUnknown_0203BCAC = NULL;
+
+// const rom data
+// todo: make it static once the file is decompiled
+
+// code
+void ChooseMonToGivePokeblock(struct Pokeblock *pokeblock, void (*callback)(void))
+{
+    gUnknown_0203BCAC = AllocZeroed(0x806C);
+    gUnknown_0203BC90 = &gUnknown_0203BCAC->info;
+    gUnknown_0203BC90->pokeblock = pokeblock;
+    gUnknown_0203BC90->callback = callback;
+    sub_816636C(sub_8166380);
+    SetMainCallback2(sub_816631C);
+}
+
+void CB2_ReturnAndChooseMonToGivePokeblock(void)
+{
+    gUnknown_0203BCAC = AllocZeroed(0x806C);
+    gUnknown_0203BC90 = &gUnknown_0203BCAC->info;
+    gUnknown_0203BC90->pokeblock = gUnknown_0203BC98;
+    gUnknown_0203BC90->callback = gUnknown_0203BC94;
+    gPokeblockMonId = sub_81672E4(gPokeblockMonId);
+    gUnknown_0203BC90->field_56 = gPokeblockMonId < 4 ? 0 : 1;
+    sub_816636C(sub_8166380);
+    SetMainCallback2(sub_81662C0);
+}
+
+void sub_81662C0(void)
+{
+    gUnknown_0203BC90->field_0();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+    if (gUnknown_0203BC90->field_0 == sub_8166564)
+    {
+        gUnknown_0203BC90->field_50 = 0;
+        SetMainCallback2(sub_8166304);
+    }
+}
+
+void sub_8166304(void)
+{
+    sub_81668F8();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
+
+void sub_816631C(void)
+{
+    gUnknown_0203BC90->field_0();
+    AnimateSprites();
+    BuildOamBuffer();
+    RunTextPrinters();
+    UpdatePaletteFade();
+}
+
+void sub_8166340(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+    sub_81D2108(gUnknown_0203BCAC->field_7C58);
+    sub_80BA0A8();
+}
+
+void sub_816636C(void (*func)(void))
+{
+    gUnknown_0203BC90->field_0 = func;
+    gUnknown_0203BC90->field_50 = 0;
+}
+
+void sub_8166380(void)
+{
+    switch (gUnknown_0203BC90->field_50)
+    {
+        case 0:
+            gUnknown_0203BCAC->field_0[0x7B10] = 0xFF;
+            sub_81D1ED4(gUnknown_0203BCAC->field_7C58);
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 1:
+            ResetSpriteData();
+            FreeAllSpritePalettes();
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 2:
+            SetVBlankCallback(NULL);
+            CpuFill32(0, (void*)(VRAM), VRAM_SIZE);
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 3:
+            ResetBgsAndClearDma3BusyFlags(0);
+            InitBgsFromTemplates(0, gUnknown_085DFCCC, ARRAY_COUNT(gUnknown_085DFCCC));
+            InitWindows(gUnknown_085DFCDC);
+            DeactivateAllTextPrinters();
+            sub_809882C(0, 0x97, 0xE0);
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 4:
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 5:
+            if (!sub_8168328())
+            {
+                gUnknown_0203BC90->field_50++;
+            }
+            break;
+        case 6:
+            gKeyRepeatStartDelay = 20;
+            sub_8167420();
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 7:
+            if (!sub_8167930())
+            {
+                gUnknown_0203BC90->field_50++;
+            }
+            break;
+        case 8:
+            sub_8167608(0);
+            sub_8167760();
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 9:
+            if (!sub_81D312C(&gUnknown_0203BCAC->field_0[0x7B0E]))
+            {
+                gUnknown_0203BC90->field_50++;
+            }
+            break;
+        case 10:
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 11:
+            sub_81D2754(gUnknown_0203BCAC->field_7C58, &gUnknown_0203BCAC->field_0[0x7C6C]);
+            sub_81D20AC(gUnknown_0203BCAC->field_7C58);
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 12:
+            if (!sub_81D20BC(gUnknown_0203BCAC->field_7C58))
+            {
+                sub_81D1F84(gUnknown_0203BCAC->field_7C58, &gUnknown_0203BCAC->field_7C58[0x14], &gUnknown_0203BCAC->field_7C58[0x14]);
+                gUnknown_0203BC90->field_50++;
+            }
+            break;
+        case 13:
+            sub_81D2230(gUnknown_0203BCAC->field_7C58);
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 14:
+            PutWindowTilemap(0);
+            PutWindowTilemap(1);
+            sub_8167BA0(0, 1);
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 15:
+            sub_816636C(sub_8166564);
+            break;
+    }
+}

sym_common.txt

@@ -405,7 +405,7 @@ gUnknown_030062F4: @ 30062F4
 gUnknown_03006300: @ 3006300
 	.space 0x10
 
-gUnknown_03006310: @ 3006310
+gMultiuseListMenuTemplate: @ 3006310
 	.space 0x18
 
 gUnknown_03006328: @ 3006328

sym_ewram.txt

@@ -1116,14 +1116,7 @@ gUnknown_0203AB34: @ 203AB34
 gUnknown_0203AB40: @ 203AB40
 	.space 0x8
 	
-gUnknown_0203AB48: @ 203AB48
+	.include "src/pokeblock.o"
-	.space 0x6
-
-gUnknown_0203AB4E: @ 203AB4E
-	.space 0x2
-
-gUnknown_0203AB50: @ 203AB50
-	.space 0x4
 
 gUnknown_0203AB54: @ 203AB54
 	.space 0x1
@@ -1257,32 +1250,7 @@ gUnknown_0203BC88: @ 203BC88
 gUnknown_0203BC8C: @ 203BC8C
 	.space 0x4
 
-gUnknown_0203BC90: @ 203BC90
+	.include "src/use_pokeblock.o"
-	.space 0x4
-
-gUnknown_0203BC94: @ 203BC94
-	.space 0x4
-
-gUnknown_0203BC98: @ 203BC98
-	.space 0x4
-
-gUnknown_0203BC9C: @ 203BC9C
-	.space 0x2
-
-gUnknown_0203BC9E: @ 203BC9E
-	.space 0x2
-
-gUnknown_0203BCA0: @ 203BCA0
-	.space 0x4
-
-gUnknown_0203BCA4: @ 203BCA4
-	.space 0x4
-
-gUnknown_0203BCA8: @ 203BCA8
-	.space 0x4
-
-gUnknown_0203BCAC: @ 203BCAC
-	.space 0x4
 
 gUnknown_0203BCB0: @ 203BCB0
 	.space 0x4
@@ -1344,11 +1312,7 @@ gUnknown_0203BCF8: @ 203BCF8
 gBraillePuzzleCallbackFlag: @ 203BD14
 	.space 0x4
 
-gUnknown_0203BD18: @ 203BD18
+	.include "src/pokeblock_feed.o"
-	.space 0x4
-
-gUnknown_0203BD1C: @ 203BD1C
-	.space 0x8
 
 gUnknown_0203BD24: @ 203BD24
 	.space 0x2