ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-18 01:14:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

sub_818D180

Browse Source
This commit is contained in:
PikalaxALT 2017-09-18 21:28:28 -04:00
parent 7de2140b86
commit 16b0b386be
2 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
asm/battle_dome_cards.s
View File

@ -6,39 +6,6 @@
.text .text
thumb_func_start sub_818D180
sub_818D180: @ 818D180
push {r4,r5,lr}
adds r5, r1, 0
ldr r1, [sp, 0xC]
lsls r0, 16
lsrs r0, 16
lsls r3, 24
lsrs r4, r3, 24
lsls r1, 24
cmp r1, 0
bne _0818D1A4
adds r1, r5, 0
bl species_and_otid_get_pal
lsls r1, r4, 4
movs r2, 0x20
bl LoadCompressedPalette
b _0818D1B4
_0818D1A4:
ldr r1, =gTrainerFrontPicPaletteTable
lsls r0, 3
adds r0, r1
ldr r0, [r0]
lsls r1, r4, 4
movs r2, 0x20
bl LoadCompressedPalette
_0818D1B4:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_818D180
thumb_func_start uns_builder_assign_animtable1 thumb_func_start uns_builder_assign_animtable1
uns_builder_assign_animtable1: @ 818D1C0 uns_builder_assign_animtable1: @ 818D1C0
push {lr} push {lr}

12
src/battle_dome_cards.c
View File

@ -122,3 +122,15 @@ void sub_818D0C4(u16 species, u32 otId, u32 personality, u8 paletteSlot, u16 pal
} }
} }
} }
void sub_818D180(u16 species, u32 otId, u32 personality, u8 paletteSlot, bool8 isTrainer)
{
if (!isTrainer)
{
LoadCompressedPalette(species_and_otid_get_pal(species, otId, personality), paletteSlot * 0x10, 0x20);
}
else
{
LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, paletteSlot * 0x10, 0x20);
}
}