From 4db5ef3ae64896f27ccb91536d7d426541fbcd5a Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Wed, 22 Aug 2018 21:41:34 +0100 Subject: [PATCH] Convert more data --- data/data2b.s | 50 -------------- .../data/trainer_graphics/back_pic_anims.h | 67 +++++++++++++++++++ src/data2b.c | 2 +- 3 files changed, 68 insertions(+), 51 deletions(-) create mode 100644 include/data/trainer_graphics/back_pic_anims.h diff --git a/data/data2b.s b/data/data2b.s index 31020a852c..c135bc4391 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -4449,53 +4449,3 @@ gUnknown_08305CB4:: @ 8305CB4 .2byte 0x0000, 0x0018, 0x0001, 0x0009, 0x0002, 0x0018, 0x0000, 0x0009 .2byte 0x0003, 0x0032, 0xffff, 0x0000 - .align 2 -gUnknown_08305CCC:: @ 8305CCC - .4byte AnimCmd_82FF540 - .4byte gUnknown_08305C24 - - .align 2 -gUnknown_08305CD4:: @ 8305CD4 - .4byte AnimCmd_82FF540 - .4byte gUnknown_08305C3C - - .align 2 -gUnknown_08305CDC:: @ 8305CDC - .4byte gAnimCmd_General_Frame0 - .4byte gUnknown_08305C6C - - .align 2 -gUnknown_08305CE4:: @ 8305CE4 - .4byte gAnimCmd_General_Frame0 - .4byte gUnknown_08305C84 - - .align 2 -gUnknown_08305CEC:: @ 8305CEC - .4byte AnimCmd_82FF540 - .4byte gUnknown_08305C9C - - .align 2 -gUnknown_08305CF4:: @ 8305CF4 - .4byte AnimCmd_82FF540 - .4byte gUnknown_08305CB4 - - .align 2 -gUnknown_08305CFC:: @ 8305CFC - .4byte AnimCmd_82FF540 - .4byte gUnknown_08305C54 - - .align 2 -gUnknown_08305D04:: @ 8305D04 - .4byte AnimCmd_82FF540 - .4byte gUnknown_08305C3C - - .align 2 -gUnknown_08305D0C:: @ 8305D0C - .4byte gUnknown_08305CCC - .4byte gUnknown_08305CD4 - .4byte gUnknown_08305CDC - .4byte gUnknown_08305CE4 - .4byte gUnknown_08305CEC - .4byte gUnknown_08305CF4 - .4byte gUnknown_08305CFC - .4byte gUnknown_08305D04 diff --git a/include/data/trainer_graphics/back_pic_anims.h b/include/data/trainer_graphics/back_pic_anims.h new file mode 100644 index 0000000000..67078401e0 --- /dev/null +++ b/include/data/trainer_graphics/back_pic_anims.h @@ -0,0 +1,67 @@ +extern const union AnimCmd gUnknown_08305C24[]; +extern const union AnimCmd gUnknown_08305C3C[]; +extern const union AnimCmd gUnknown_08305C6C[]; +extern const union AnimCmd gUnknown_08305C84[]; +extern const union AnimCmd gUnknown_08305C9C[]; +extern const union AnimCmd gUnknown_08305CB4[]; +extern const union AnimCmd gUnknown_08305C54[]; + +const union AnimCmd *const gUnknown_08305CCC[] = +{ + AnimCmd_82FF540, + gUnknown_08305C24, +}; + +const union AnimCmd *const gUnknown_08305CD4[] = +{ + AnimCmd_82FF540, + gUnknown_08305C3C, +}; + +const union AnimCmd *const gUnknown_08305CDC[] = +{ + gAnimCmd_General_Frame0, + gUnknown_08305C6C, +}; + +const union AnimCmd *const gUnknown_08305CE4[] = +{ + gAnimCmd_General_Frame0, + gUnknown_08305C84, +}; + +const union AnimCmd *const gUnknown_08305CEC[] = +{ + AnimCmd_82FF540, + gUnknown_08305C9C, +}; + +const union AnimCmd *const gUnknown_08305CF4[] = +{ + AnimCmd_82FF540, + gUnknown_08305CB4, +}; + +const union AnimCmd *const gUnknown_08305CFC[] = +{ + AnimCmd_82FF540, + gUnknown_08305C54, +}; + +const union AnimCmd *const gUnknown_08305D04[] = +{ + AnimCmd_82FF540, + gUnknown_08305C3C, +}; + +const union AnimCmd *const *const gUnknown_08305D0C[] = +{ + gUnknown_08305CCC, + gUnknown_08305CD4, + gUnknown_08305CDC, + gUnknown_08305CE4, + gUnknown_08305CEC, + gUnknown_08305CF4, + gUnknown_08305CFC, + gUnknown_08305D04, +}; diff --git a/src/data2b.c b/src/data2b.c index 8a78a9d904..78e671a7ac 100644 --- a/src/data2b.c +++ b/src/data2b.c @@ -5,7 +5,7 @@ extern const union AnimCmd gAnimCmd_General_Frame0[]; extern const union AnimCmd AnimCmd_82FF540[]; //#include "data/trainer_graphics/front_pic_tables.h" - +#include "data/trainer_graphics/back_pic_anims.h" #include "data/trainer_graphics/back_pic_tables.h" #include "data/pokemon_graphics/enemy_mon_elevation.h"