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/battle_7.s | |
| parent | 24a1e3e544eecbb10905f41c257fce8df7e3a5ce (diff) | |
sprite.c: move ewram, iwram, rom data
Diffstat (limited to 'asm/battle_7.s')
| -rw-r--r-- | asm/battle_7.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/battle_7.s b/asm/battle_7.s index 9e6bdfbe2..31a4423a7 100644 --- a/asm/battle_7.s +++ b/asm/battle_7.s @@ -1768,10 +1768,10 @@ sub_805DFFC: @ 805DFFC push {r4-r7,lr} ldr r4, =gUnknown_0832C128 adds r0, r4, 0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette adds r4, 0x8 adds r0, r4, 0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette bl battle_type_is_double lsls r0, 24 cmp r0, 0 @@ -1836,10 +1836,10 @@ _0805E09C: bne _0805E0B8 ldr r4, =gUnknown_0832C128 adds r0, r4, 0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette adds r4, 0x8 adds r0, r4, 0 - bl LoadTaggedObjectPalette + bl LoadSpritePalette b _0805E1AE .pool _0805E0B8: |