diff --git a/asm/battle_dome_cards.s b/asm/battle_dome_cards.s index 8bb1971c41..525aa3d79a 100644 --- a/asm/battle_dome_cards.s +++ b/asm/battle_dome_cards.s @@ -6,33 +6,6 @@ .text - thumb_func_start nullsub_122 -nullsub_122: @ 818CFC8 - bx lr - thumb_func_end nullsub_122 - - thumb_func_start dp13_810BB8C -dp13_810BB8C: @ 818CFCC - push {r4-r7,lr} - ldr r4, =gUnknown_0860B058 - ldr r3, =gUnknown_0203CD04 - movs r2, 0x7 -_0818CFD4: - adds r1, r3, 0 - adds r0, r4, 0 - ldm r0!, {r5-r7} - stm r1!, {r5-r7} - adds r3, 0xC - subs r2, 0x1 - cmp r2, 0 - bge _0818CFD4 - movs r0, 0 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end dp13_810BB8C - thumb_func_start load_pokemon_image_TODO @ int load_pokemon_image_TODO(int species_num, unsigned int a2, u8 a3, void *a4, int a5, u8 a6) load_pokemon_image_TODO: @ 818CFF4 diff --git a/ld_script.txt b/ld_script.txt index 8a3f3e1395..9ba5755c9a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -239,6 +239,7 @@ SECTIONS { asm/recorded_battle.o(.text); asm/battle_controller_recorded_opponent.o(.text); asm/battle_controller_recorded_player.o(.text); + src/battle_dome_cards.o(.text); asm/battle_dome_cards.o(.text); asm/lilycove_lady.o(.text); asm/battle_frontier_1.o(.text); diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c new file mode 100644 index 0000000000..0afad23f6c --- /dev/null +++ b/src/battle_dome_cards.c @@ -0,0 +1,37 @@ + +// Includes +#include "global.h" + +// Static type declarations + +struct BattleDomeCard { + u8 unk_00[12]; +}; + +// Static RAM declarations + +extern struct BattleDomeCard gUnknown_0203CD04[8]; + +// Static ROM declarations + +// .rodata + +extern const struct BattleDomeCard gUnknown_0860B058; + +// .text + +void nullsub_122(void) +{ + +} + +bool8 dp13_810BB8C(void) +{ + int i; + + for (i = 0; i < 8; i ++) + { + gUnknown_0203CD04[i] = gUnknown_0860B058; + } + return FALSE; +}