summaryrefslogtreecommitdiff
path: root/asm/main_menu.s
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-09-02 13:11:19 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-09-02 13:11:19 +0200
commit84240b1a5a445ff4efe21580c22051323a954fba (patch)
tree2ad5e5cb65cf0e06532a4500ef1b76e9a3e519f7 /asm/main_menu.s
parent24a1e3e544eecbb10905f41c257fce8df7e3a5ce (diff)
sprite.c: move ewram, iwram, rom data
Diffstat (limited to 'asm/main_menu.s')
-rw-r--r--asm/main_menu.s6
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/main_menu.s b/asm/main_menu.s
index 0c5ababfc..e359f714f 100644
--- a/asm/main_menu.s
+++ b/asm/main_menu.s
@@ -130,7 +130,7 @@ InitMainMenu: @ 802F6F4
bl remove_some_task
bl ResetTasks
bl ResetSpriteData
- bl ResetObjectPaletteAllocator
+ bl FreeAllSpritePalettes
cmp r4, 0
beq _0802F7EC
movs r0, 0x1
@@ -1931,7 +1931,7 @@ task_new_game_prof_birch_speech_1: @ 80307B0
bl LoadPalette
bl remove_some_task
bl ResetSpriteData
- bl ResetObjectPaletteAllocator
+ bl FreeAllSpritePalettes
bl dp13_810BB8C
adds r0, r4, 0
bl AddBirchSpeechObjects
@@ -3710,7 +3710,7 @@ new_game_prof_birch_speech_part2_start: @ 8031678
strh r0, [r4, 0x10]
bl remove_some_task
bl ResetSpriteData
- bl ResetObjectPaletteAllocator
+ bl FreeAllSpritePalettes
bl dp13_810BB8C
adds r0, r5, 0
bl AddBirchSpeechObjects