dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

uns_builder_assign_animtable1

Browse Source
This commit is contained in:
PikalaxALT
2017-09-18 21:31:28 -04:00
parent 16b0b386be
commit 8aeb5ea301
2 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
asm/battle_dome_cards.s
View File

@@ -6,28 +6,6 @@
.text .text
thumb_func_start uns_builder_assign_animtable1
uns_builder_assign_animtable1: @ 818D1C0
push {lr}
lsls r0, 24
cmp r0, 0
bne _0818D1D8
ldr r1, =gUnknown_0203CCEC
ldr r0, =gUnknown_082FF70C
str r0, [r1, 0x8]
b _0818D1E0
.pool
_0818D1D8:
ldr r0, =gUnknown_0203CCEC
ldr r1, =gUnknown_0830536C
ldr r1, [r1]
str r1, [r0, 0x8]
_0818D1E0:
pop {r0}
bx r0
.pool
thumb_func_end uns_builder_assign_animtable1
thumb_func_start oamt_spawn_poke_or_trainer_picture thumb_func_start oamt_spawn_poke_or_trainer_picture
oamt_spawn_poke_or_trainer_picture: @ 818D1EC oamt_spawn_poke_or_trainer_picture: @ 818D1EC
push {r4-r7,lr} push {r4-r7,lr}

14
src/battle_dome_cards.c
View File

@@ -11,6 +11,8 @@ extern const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES];
extern const struct CompressedSpriteSheet gTrainerFrontPicTable[]; extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
extern const struct CompressedSpriteSheet gTrainerBackPicTable[]; extern const struct CompressedSpriteSheet gTrainerBackPicTable[];
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern const union AnimCmd *const gUnknown_082FF70C[];
extern const union AnimCmd *const *const gUnknown_0830536C[];
// Static type declarations // Static type declarations
@@ -134,3 +136,15 @@ void sub_818D180(u16 species, u32 otId, u32 personality, u8 paletteSlot, bool8 i
LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, paletteSlot * 0x10, 0x20); LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, paletteSlot * 0x10, 0x20);
} }
} }
void uns_builder_assign_animtable1(bool8 isTrainer)
{
if (!isTrainer)
{
gUnknown_0203CCEC.anims = gUnknown_082FF70C;
}
else
{
gUnknown_0203CCEC.anims = gUnknown_0830536C[0];
}
}