Merge pull request #76 from jiangzhengwenjz/misc

new_menu_helpers, multiboot, hof_pc, play_time, decompress, reset_save_heap, save_location, mail_data, fldeff_*

1 files changed, 30 insertions, 30 deletions

diff --git a/asm/item_menu.s b/asm/item_menu.s
index 4e4c2ebfd..001198d95 100644
--- a/asm/item_menu.s
+++ b/asm/item_menu.s
@@ -170,7 +170,7 @@ sub_8107EE0: @ 8107EE0
 	bl RunTasks
 	bl AnimateSprites
 	bl BuildOamBuffer
-	bl do_scheduled_bg_tilemap_copies_to_vram
+	bl DoScheduledBgTilemapCopiesToVram
 	bl UpdatePaletteFade
 	pop {r0}
 	bx r0
@@ -254,7 +254,7 @@ _08107F60:
 	.4byte _081080DE
 _08107FB0:
 	bl SetVBlankHBlankCallbacksToNull
-	bl clear_scheduled_bg_copies_to_vram
+	bl ClearScheduledBgCopiesToVram
 	b _08108104
 _08107FBA:
 	bl ScanlineEffect_Stop
@@ -542,7 +542,7 @@ sub_81081D0: @ 81081D0
 	movs r0, 0x1
 	bl SetBgTilemapBuffer
 	movs r0, 0x1
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 	movs r1, 0xC1
 	lsls r1, 6
 	movs r0, 0
@@ -595,19 +595,19 @@ _08108264:
 	.4byte _08108340
 	.4byte _0810834C
 _0810827C:
-	bl reset_temp_tile_data_buffers
+	bl ResetTempTileDataBuffers
 	ldr r1, _08108294 @ =gUnknown_8E830CC
 	movs r0, 0
 	str r0, [sp]
 	movs r0, 0x1
 	movs r2, 0
 	movs r3, 0
-	bl decompress_and_copy_tile_data_to_vram
+	bl DecompressAndCopyTileDataToVram
 	b _08108352
 	.align 2, 0
 _08108294: .4byte gUnknown_8E830CC
 _08108298:
-	bl free_temp_tile_data_buffers_if_possible
+	bl FreeTempTileDataBuffersIfPossible
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -676,20 +676,20 @@ _0810832C: .4byte gSaveBlock2Ptr
 _08108330: .4byte gUnknown_83D41E4
 _08108334:
 	ldr r0, _0810833C @ =gUnknown_83D41EC
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	b _08108352
 	.align 2, 0
 _0810833C: .4byte gUnknown_83D41EC
 _08108340:
 	ldr r0, _08108348 @ =gUnknown_83D41F4
-	bl LoadCompressedObjectPalette
+	bl LoadCompressedSpritePalette
 	b _08108352
 	.align 2, 0
 _08108348: .4byte gUnknown_83D41F4
 _0810834C:
 	ldr r0, _08108360 @ =gBagSwapSpriteSheet
 _0810834E:
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 _08108352:
 	ldr r0, _08108364 @ =gUnknown_203AD10
 	ldr r1, [r0]
@@ -702,7 +702,7 @@ _08108360: .4byte gBagSwapSpriteSheet
 _08108364: .4byte gUnknown_203AD10
 _08108368:
 	ldr r0, _08108378 @ =gBagSwapSpritePalette
-	bl LoadCompressedObjectPalette
+	bl LoadCompressedSpritePalette
 	ldr r1, [r4]
 	movs r0, 0
 	strb r0, [r1, 0x10]
@@ -2192,7 +2192,7 @@ DisplayItemMessageInBag: @ 8108E70
 	movs r3, 0xD
 	bl DisplayMessageAndContinueTask
 	movs r0, 0
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 	add sp, 0x10
 	pop {r3,r4}
 	mov r8, r3
@@ -2516,7 +2516,7 @@ sub_8109140: @ 8109140
 	movs r3, 0x1E
 	bl SetBgRectPal
 	movs r0, 0x1
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 	add sp, 0x8
 	pop {r0}
 	bx r0
@@ -2619,7 +2619,7 @@ sub_81091D0: @ 81091D0
 	adds r2, r3
 	bl DestroyListMenu
 	movs r0, 0
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 	ldr r0, _08109290 @ =gUnknown_203AD10
 	ldr r0, [r0]
 	ldrb r1, [r0, 0x5]
@@ -2640,7 +2640,7 @@ _08109242:
 	movs r3, 0x1
 	bl FillBgTilemapBufferRect_Palette0
 	movs r0, 0x1
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 	ldr r0, _0810928C @ =gUnknown_203ACFC
 	ldrb r0, [r0, 0x6]
 	adds r0, r6
@@ -2792,7 +2792,7 @@ _08109358:
 	movs r0, 0x2
 	bl PutWindowTilemap
 	movs r0, 0
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 	bl sub_8108888
 	bl sub_81088D8
 	adds r0, r6, 0
@@ -3374,7 +3374,7 @@ sub_8109854: @ 8109854
 	movs r2, 0xB
 	bl CopyToBgTilemapBufferRect
 	movs r0, 0x1
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 	add sp, 0x8
 	pop {r0}
 	bx r0
@@ -3852,7 +3852,7 @@ sub_8109C50: @ 8109C50
 	movs r0, 0x1
 	bl PutWindowTilemap
 	movs r0, 0
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	cmp r0, 0
@@ -4008,7 +4008,7 @@ sub_8109DB0: @ 8109DB0
 	movs r0, 0x1
 	bl PutWindowTilemap
 	movs r0, 0
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 	ldrb r0, [r4]
 	movs r1, 0x1
 	bl bag_menu_print_cursor_
@@ -4066,7 +4066,7 @@ _08109E20:
 	movs r0, 0
 	bl sub_810BA3C
 	movs r0, 0
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 	bl sub_8108978
 	adds r0, r5, 0
 	bl sub_8109D38
@@ -4089,7 +4089,7 @@ _08109E64:
 	movs r0, 0x1
 	bl PutWindowTilemap
 	movs r0, 0
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 	ldrb r0, [r4]
 	movs r1, 0x1
 	bl bag_menu_print_cursor_
@@ -4234,7 +4234,7 @@ _08109F6E:
 	movs r0, 0x1
 	bl PutWindowTilemap
 	movs r0, 0
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 	ldrb r0, [r7]
 	movs r1, 0x1
 	bl bag_menu_print_cursor_
@@ -4538,7 +4538,7 @@ sub_810A1F8: @ 810A1F8
 	lsrs r0, 24
 	strh r0, [r5]
 	movs r0, 0
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 	ldrb r0, [r5]
 	movs r1, 0x1
 	bl bag_menu_print_cursor_
@@ -4582,7 +4582,7 @@ sub_810A288: @ 810A288
 	movs r0, 0
 	bl PutWindowTilemap
 	movs r0, 0
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 	ldrb r0, [r4]
 	movs r1, 0x1
 	bl bag_menu_print_cursor_
@@ -4611,7 +4611,7 @@ sub_810A2DC: @ 810A2DC
 	movs r0, 0x1
 	bl PutWindowTilemap
 	movs r0, 0
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 	ldr r1, _0810A320 @ =gTasks
 	lsls r0, r4, 2
 	adds r0, r4
@@ -5160,7 +5160,7 @@ sub_810A720: @ 810A720
 	movs r0, 0x1
 	bl PutWindowTilemap
 	movs r0, 0
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 	ldrb r0, [r4]
 	movs r1, 0x1
 	bl bag_menu_print_cursor_
@@ -5339,7 +5339,7 @@ _0810A8BC:
 	movs r0, 0
 	bl PutWindowTilemap
 	movs r0, 0
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 	bl sub_8108978
 	adds r0, r4, 0
 	bl sub_810A690
@@ -5366,7 +5366,7 @@ _0810A8F0:
 	movs r0, 0x1
 	bl PutWindowTilemap
 	movs r0, 0
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 	bl sub_8108978
 	ldrb r0, [r5]
 	movs r1, 0x1
@@ -5393,7 +5393,7 @@ sub_810A940: @ 810A940
 	movs r0, 0
 	bl PutWindowTilemap
 	movs r0, 0
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 	ldr r0, _0810A9B8 @ =gSpecialVar_ItemId
 	ldrh r0, [r0]
 	ldr r1, _0810A9BC @ =gStringVar1
@@ -5690,7 +5690,7 @@ _0810ABBC:
 	movs r0, 0
 	bl sub_810BA3C
 	movs r0, 0
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 	bl sub_8108978
 	adds r0, r5, 0
 	bl sub_810AC40
@@ -5711,7 +5711,7 @@ _0810AC00:
 	movs r0, 0x1
 	bl PutWindowTilemap
 	movs r0, 0
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 	ldrb r0, [r4]
 	movs r1, 0x1
 	bl bag_menu_print_cursor_