diff options
| author | YamaArashi <shadow962@live.com> | 2016-05-20 11:45:24 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-05-21 10:35:53 -0700 |
| commit | c0203de808a98d27446e01c6b7e9f9311a5ad3bf (patch) | |
| tree | e538179372ce7cddc50b851e4c24a4c7e0a40c81 /asm/rom2.s | |
| parent | 4af578c1865e4b620f4c64401e0a16ccbd9efc8d (diff) | |
sprite.c and updated preproc
Diffstat (limited to 'asm/rom2.s')
| -rw-r--r-- | asm/rom2.s | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/asm/rom2.s b/asm/rom2.s index 17df814d0..3b0d442e3 100644 --- a/asm/rom2.s +++ b/asm/rom2.s @@ -157,8 +157,8 @@ _080071A0: .4byte gUnknown_081E29A8 thumb_func_start sub_80071A4 sub_80071A4: @ 80071A4 push {r4-r6,lr} - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes bl ResetTasks ldr r0, _08007248 bl SetVBlankCallback @@ -204,8 +204,8 @@ _080071E4: movs r1, 0 bl CreateTask bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably ldr r1, _08007264 movs r0, 0 @@ -310,8 +310,8 @@ _080072FC: .4byte gGameVersion thumb_func_start sub_8007300 sub_8007300: @ 8007300 push {lr} - bl LoadOamFromSprites - bl ProcessObjectCopyRequests + bl LoadOam + bl ProcessSpriteCopyRequests bl copy_pal_bg_faded_to_pal_ram pop {r0} bx r0 @@ -663,8 +663,8 @@ c2_08009A8C: @ 80075CC movs r2, 0 bl sub_8007428 bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably pop {r0} bx r0 @@ -2837,8 +2837,8 @@ _080085B8: .4byte 0x0300295c thumb_func_start sub_80085BC sub_80085BC: @ 80085BC push {r4,lr} - bl ResetAllObjectData - bl ResetObjectPaletteAllocator + bl ResetSpriteData + bl FreeAllSpritePalettes bl pal_fade_control_reset_maybe movs r0, 0 movs r1, 0 @@ -2873,8 +2873,8 @@ sub_80085BC: @ 80085BC bl CreateTask bl sub_8074D08 bl RunTasks - bl CallObjectCallbacks - bl PrepareSpritesForOamLoad + bl AnimateSprites + bl BuildOamBuffer bl fade_and_return_progress_probably ldr r0, _0800864C bl SetMainCallback2 |