summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-09-18 21:31:28 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2017-09-18 21:31:28 -0400
commit8aeb5ea3017dfb7ea9fd8b8f1ef6bc9d4a0fbba9 (patch)
tree2b097c2e1b0c0c6e2b06949e59af4d084e7f2e1d
parent16b0b386be02390ab847a68b279f51aea54c3a95 (diff)
uns_builder_assign_animtable1
-rw-r--r--asm/battle_dome_cards.s22
-rw-r--r--src/battle_dome_cards.c14
2 files changed, 14 insertions, 22 deletions
diff --git a/asm/battle_dome_cards.s b/asm/battle_dome_cards.s
index 774872c65..73948ea94 100644
--- a/asm/battle_dome_cards.s
+++ b/asm/battle_dome_cards.s
@@ -6,28 +6,6 @@
.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
oamt_spawn_poke_or_trainer_picture: @ 818D1EC
push {r4-r7,lr}
diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c
index 810ee82eb..e92773a1b 100644
--- a/src/battle_dome_cards.c
+++ b/src/battle_dome_cards.c
@@ -11,6 +11,8 @@ extern const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES];
extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
extern const struct CompressedSpriteSheet gTrainerBackPicTable[];
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
+extern const union AnimCmd *const gUnknown_082FF70C[];
+extern const union AnimCmd *const *const gUnknown_0830536C[];
// 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);
}
}
+
+void uns_builder_assign_animtable1(bool8 isTrainer)
+{
+ if (!isTrainer)
+ {
+ gUnknown_0203CCEC.anims = gUnknown_082FF70C;
+ }
+ else
+ {
+ gUnknown_0203CCEC.anims = gUnknown_0830536C[0];
+ }
+}