diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-02 13:11:19 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-02 13:11:19 +0200 |
| commit | 84240b1a5a445ff4efe21580c22051323a954fba (patch) | |
| tree | 2ad5e5cb65cf0e06532a4500ef1b76e9a3e519f7 /asm/script_pokemon_util_80F87D8.s | |
| parent | 24a1e3e544eecbb10905f41c257fce8df7e3a5ce (diff) | |
sprite.c: move ewram, iwram, rom data
Diffstat (limited to 'asm/script_pokemon_util_80F87D8.s')
| -rw-r--r-- | asm/script_pokemon_util_80F87D8.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/script_pokemon_util_80F87D8.s b/asm/script_pokemon_util_80F87D8.s index 1beaae365..6134aebe7 100644 --- a/asm/script_pokemon_util_80F87D8.s +++ b/asm/script_pokemon_util_80F87D8.s @@ -479,7 +479,7 @@ _080F8B7C: thumb_func_start sub_80F8B94 sub_80F8B94: @ 80F8B94 push {r4-r7,lr} - ldr r1, =gUnknown_0300301C + ldr r1, =gReservedSpritePaletteCount movs r0, 0xC strb r0, [r1] ldr r0, =gUnknown_02039F2A @@ -899,7 +899,7 @@ _080F8F42: adds r4, r0, r1 ldrb r0, [r4, 0x5] lsrs r0, 4 - bl GetObjectPaletteTagBySlot + bl GetSpritePaletteTagByPaletteNum lsls r0, 16 lsrs r0, 16 bl FreeSpritePaletteByTag |