diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-07-01 21:45:36 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-01 21:45:36 -0400 |
commit | 74d771ef90a3189bd2da1b35f6b42a1fa8f51e67 (patch) | |
tree | 96c754aee40f16956fb0958ecb31bd806bd99642 /asm/diploma.s | |
parent | 7f06718571de81609208a5fa402a93da63cfa8bf (diff) | |
parent | 062238aa12cb4f54f70b73459ff5b5d775f69a54 (diff) |
Merge pull request #76 from jiangzhengwenjz/misc
new_menu_helpers, multiboot, hof_pc, play_time, decompress, reset_save_heap, save_location, mail_data, fldeff_*
Diffstat (limited to 'asm/diploma.s')
-rw-r--r-- | asm/diploma.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/diploma.s b/asm/diploma.s index cfc70d694..f3fc0871a 100644 --- a/asm/diploma.s +++ b/asm/diploma.s @@ -463,7 +463,7 @@ _080F4FB8: beq _080F4FEE b _080F4FF8 _080F4FC2: - bl reset_temp_tile_data_buffers + bl ResetTempTileDataBuffers b _080F5000 _080F4FC8: ldr r1, _080F4FDC @ =gUnknown_84147C0 @@ -472,12 +472,12 @@ _080F4FC8: movs r0, 0x1 movs r2, 0 movs r3, 0 - bl decompress_and_copy_tile_data_to_vram + bl DecompressAndCopyTileDataToVram b _080F5000 .align 2, 0 _080F4FDC: .4byte gUnknown_84147C0 _080F4FE0: - bl free_temp_tile_data_buffers_if_possible + bl FreeTempTileDataBuffersIfPossible lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 |