Move data to C.
This commit is contained in:
ultima-soul
-230
@@ -7,236 +7,6 @@
|
||||
|
||||
.section .rodata
|
||||
|
||||
.align 2
|
||||
gUnknown_8234698:: @ 8234698
|
||||
obj_frame_tiles gHeap + 0x8000, 0x800
|
||||
obj_frame_tiles gHeap + 0x8800, 0x800
|
||||
obj_frame_tiles gHeap + 0x9000, 0x800
|
||||
obj_frame_tiles gHeap + 0x9800, 0x800
|
||||
|
||||
.align 2
|
||||
gUnknown_82346B8:: @ 82346B8
|
||||
obj_frame_tiles gHeap + 0xA000, 0x800
|
||||
obj_frame_tiles gHeap + 0xA800, 0x800
|
||||
obj_frame_tiles gHeap + 0xB000, 0x800
|
||||
obj_frame_tiles gHeap + 0xB800, 0x800
|
||||
|
||||
.align 2
|
||||
gUnknown_82346D8:: @ 82346D8
|
||||
obj_frame_tiles gHeap + 0xC000, 0x800
|
||||
obj_frame_tiles gHeap + 0xC800, 0x800
|
||||
obj_frame_tiles gHeap + 0xD000, 0x800
|
||||
obj_frame_tiles gHeap + 0xD800, 0x800
|
||||
|
||||
.align 2
|
||||
gUnknown_82346F8:: @ 82346F8
|
||||
obj_frame_tiles gHeap + 0xE000, 0x800
|
||||
obj_frame_tiles gHeap + 0xE800, 0x800
|
||||
obj_frame_tiles gHeap + 0xF000, 0x800
|
||||
obj_frame_tiles gHeap + 0xF800, 0x800
|
||||
|
||||
.align 2
|
||||
gUnknown_8234718:: @ 8234718
|
||||
obj_frame_tiles gTrainerBackPic_Red, 0x0800
|
||||
obj_frame_tiles gTrainerBackPic_Red + 0x0800, 0x0800
|
||||
obj_frame_tiles gTrainerBackPic_Red + 0x1000, 0x0800
|
||||
obj_frame_tiles gTrainerBackPic_Red + 0x1800, 0x0800
|
||||
obj_frame_tiles gTrainerBackPic_Red + 0x2000, 0x0800
|
||||
|
||||
.align 2
|
||||
gUnknown_8234740:: @ 8234740
|
||||
obj_frame_tiles gTrainerBackPic_Leaf, 0x0800
|
||||
obj_frame_tiles gTrainerBackPic_Leaf + 0x0800, 0x0800
|
||||
obj_frame_tiles gTrainerBackPic_Leaf + 0x1000, 0x0800
|
||||
obj_frame_tiles gTrainerBackPic_Leaf + 0x1800, 0x0800
|
||||
obj_frame_tiles gTrainerBackPic_Leaf + 0x2000, 0x0800
|
||||
|
||||
.align 2
|
||||
gUnknown_8234768:: @ 8234768
|
||||
obj_frame_tiles gTrainerBackPic_PokeDude, 0x0800
|
||||
obj_frame_tiles gTrainerBackPic_PokeDude + 0x0800, 0x0800
|
||||
obj_frame_tiles gTrainerBackPic_PokeDude + 0x1000, 0x0800
|
||||
obj_frame_tiles gTrainerBackPic_PokeDude + 0x1800, 0x0800
|
||||
|
||||
.align 2
|
||||
gUnknown_8234788:: @ 8234788
|
||||
obj_frame_tiles gTrainerBackPic_OldMan, 0x0800
|
||||
obj_frame_tiles gTrainerBackPic_OldMan + 0x0800, 0x0800
|
||||
obj_frame_tiles gTrainerBackPic_OldMan + 0x1000, 0x0800
|
||||
obj_frame_tiles gTrainerBackPic_OldMan + 0x1800, 0x0800
|
||||
|
||||
.align 2
|
||||
gUnknown_82347A8:: @ 82347A8
|
||||
obj_frame_tiles gTrainerBackPic_RubySapphireBrendan, 0x0800
|
||||
obj_frame_tiles gTrainerBackPic_RubySapphireBrendan + 0x0800, 0x0800
|
||||
obj_frame_tiles gTrainerBackPic_RubySapphireBrendan + 0x1000, 0x0800
|
||||
obj_frame_tiles gTrainerBackPic_RubySapphireBrendan + 0x1800, 0x0800
|
||||
|
||||
.align 2
|
||||
gUnknown_82347C8:: @ 82347C8
|
||||
obj_frame_tiles gTrainerBackPic_RubySapphireMay, 0x0800
|
||||
obj_frame_tiles gTrainerBackPic_RubySapphireMay + 0x0800, 0x0800
|
||||
obj_frame_tiles gTrainerBackPic_RubySapphireMay + 0x1000, 0x0800
|
||||
obj_frame_tiles gTrainerBackPic_RubySapphireMay + 0x1800, 0x0800
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_82347E8:: @ 82347E8
|
||||
obj_image_anim_frame 0, 0
|
||||
obj_image_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_82347F0:: @ 82347F0
|
||||
obj_image_anim_frame 3, 0
|
||||
obj_image_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnim_82347F8:: @ 82347F8
|
||||
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
|
||||
obj_rot_scal_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnim_8234808:: @ 8234808
|
||||
obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
|
||||
obj_rot_scal_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnim_8234818:: @ 8234818
|
||||
obj_rot_scal_anim_frame 0x28, 0x28, 0, 0
|
||||
obj_rot_scal_anim_frame 0x12, 0x12, 0, 12
|
||||
obj_rot_scal_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnim_8234830:: @ 8234830
|
||||
obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 18
|
||||
obj_rot_scal_anim_frame 0xFFF0, 0xFFF0, 0, 15
|
||||
obj_rot_scal_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnim_8234848:: @ 8234848
|
||||
obj_rot_scal_anim_frame 0xA0, 0x100, 0, 0
|
||||
obj_rot_scal_anim_frame 0x4, 0x0, 0, 8
|
||||
obj_rot_scal_anim_frame 0xFFFC, 0x0, 0, 8
|
||||
obj_rot_scal_anim_jump 1
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnim_8234868:: @ 8234868
|
||||
obj_rot_scal_anim_frame 0x2, 0x2, 0, 20
|
||||
obj_rot_scal_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnim_8234878:: @ 8234878
|
||||
obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 20
|
||||
obj_rot_scal_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnim_8234888:: @ 8234888
|
||||
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
|
||||
obj_rot_scal_anim_frame 0xFFF0, 0xFFF0, 0, 9
|
||||
obj_rot_scal_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnim_82348A0:: @ 82348A0
|
||||
obj_rot_scal_anim_frame 0x4, 0x4, 0, 63
|
||||
obj_rot_scal_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnim_82348B0:: @ 82348B0
|
||||
obj_rot_scal_anim_frame 0x0, 0x0, -3, 5
|
||||
obj_rot_scal_anim_frame 0x0, 0x0, 3, 5
|
||||
obj_rot_scal_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnimTable_82348C8:: @ 82348C8
|
||||
.4byte gSpriteAffineAnim_82347F8
|
||||
.4byte gSpriteAffineAnim_8234818
|
||||
.4byte gSpriteAffineAnim_8234830
|
||||
.4byte gSpriteAffineAnim_8234848
|
||||
.4byte gSpriteAffineAnim_8234868
|
||||
.4byte gSpriteAffineAnim_8234878
|
||||
.4byte gSpriteAffineAnim_82348A0
|
||||
.4byte gSpriteAffineAnim_82348B0
|
||||
.4byte gSpriteAffineAnim_8234888
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnim_82348EC:: @ 82348EC
|
||||
obj_rot_scal_anim_frame 0xFFFC, 0xFFFC, 4, 63
|
||||
obj_rot_scal_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnim_82348FC:: @ 82348FC
|
||||
obj_rot_scal_anim_frame 0x0, 0x0, 3, 5
|
||||
obj_rot_scal_anim_frame 0x0, 0x0, -3, 5
|
||||
obj_rot_scal_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnim_8234914:: @ 8234914
|
||||
obj_rot_scal_anim_frame 0x0, 0x0, -5, 20
|
||||
obj_rot_scal_anim_frame 0x0, 0x0, 0, 20
|
||||
obj_rot_scal_anim_frame 0x0, 0x0, 5, 20
|
||||
obj_rot_scal_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnim_8234934:: @ 8234934
|
||||
obj_rot_scal_anim_frame 0x0, 0x0, 9, 110
|
||||
obj_rot_scal_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnimTable_8234944:: @ 8234944
|
||||
.4byte gSpriteAffineAnim_82347F8
|
||||
.4byte gSpriteAffineAnim_8234818
|
||||
.4byte gSpriteAffineAnim_8234830
|
||||
.4byte gSpriteAffineAnim_8234848
|
||||
.4byte gSpriteAffineAnim_8234868
|
||||
.4byte gSpriteAffineAnim_8234878
|
||||
.4byte gSpriteAffineAnim_82348EC
|
||||
.4byte gSpriteAffineAnim_82348FC
|
||||
.4byte gSpriteAffineAnim_8234914
|
||||
.4byte gSpriteAffineAnim_8234888
|
||||
.4byte gSpriteAffineAnim_8234934
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnimTable_82349470:: @ 82349470
|
||||
.4byte gSpriteAffineAnim_8234808
|
||||
.4byte gSpriteAffineAnim_8234818
|
||||
.4byte gSpriteAffineAnim_8234830
|
||||
.4byte gSpriteAffineAnim_8234848
|
||||
.4byte gSpriteAffineAnim_8234868
|
||||
.4byte gSpriteAffineAnim_8234878
|
||||
.4byte gSpriteAffineAnim_82348EC
|
||||
.4byte gSpriteAffineAnim_82348FC
|
||||
.4byte gSpriteAffineAnim_8234914
|
||||
.4byte gSpriteAffineAnim_8234888
|
||||
.4byte gSpriteAffineAnim_8234934
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_823499C:: @ 823499C
|
||||
obj_image_anim_frame 0, 0
|
||||
obj_image_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_82349A4:: @ 82349A4
|
||||
obj_image_anim_frame 1, 0
|
||||
obj_image_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_82349AC:: @ 82349AC
|
||||
obj_image_anim_frame 2, 0
|
||||
obj_image_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_82349B4:: @ 82349B4
|
||||
obj_image_anim_frame 3, 0
|
||||
obj_image_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAnimTable_82349BC:: @ 82349BC
|
||||
.4byte gSpriteAnim_823499C
|
||||
.4byte gSpriteAnim_82349A4
|
||||
.4byte gSpriteAnim_82349AC
|
||||
.4byte gSpriteAnim_82349B4
|
||||
|
||||
.section .rodata.82350AC
|
||||
|
||||
gMonFrontPicTable:: @ 82350AC
|
||||
.incbin "baserom.gba", 0x2350AC, 0xE8
|
||||
|
||||
|
||||
+6
-6
@@ -54,11 +54,11 @@ extern const struct SpriteFrameImage gUnknown_8234698[];
|
||||
extern const struct SpriteFrameImage gUnknown_82346B8[];
|
||||
extern const struct SpriteFrameImage gUnknown_82346D8[];
|
||||
extern const struct SpriteFrameImage gUnknown_82346F8[];
|
||||
extern const struct SpriteFrameImage gUnknown_8234718[];
|
||||
extern const struct SpriteFrameImage gUnknown_8234740[];
|
||||
extern const struct SpriteFrameImage gUnknown_8234768[];
|
||||
extern const struct SpriteFrameImage gUnknown_8234788[];
|
||||
extern const struct SpriteFrameImage gUnknown_82347A8[];
|
||||
extern const struct SpriteFrameImage gUnknown_82347C8[];
|
||||
extern const struct SpriteFrameImage gTrainerBackPicTable_Red[];
|
||||
extern const struct SpriteFrameImage gTrainerBackPicTable_Leaf[];
|
||||
extern const struct SpriteFrameImage gTrainerBackPicTable_PokeDude[];
|
||||
extern const struct SpriteFrameImage gTrainerBackPicTable_OldMan[];
|
||||
extern const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireBrendan[];
|
||||
extern const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireMay[];
|
||||
|
||||
#endif // GUARD_DATA_H
|
||||
|
||||
@@ -1036,4 +1036,11 @@ extern const u32 gBerryPouchBgPal0FemaleOverride[];
|
||||
extern const u32 gBerryPouchSpritePalette[];
|
||||
extern const u8 gBerryPouchBg1Tilemap[];
|
||||
|
||||
extern const u8 gTrainerBackPic_Red[];
|
||||
extern const u8 gTrainerBackPic_Leaf[];
|
||||
extern const u8 gTrainerBackPic_PokeDude[];
|
||||
extern const u8 gTrainerBackPic_OldMan[];
|
||||
extern const u8 gTrainerBackPic_RubySapphireBrendan[];
|
||||
extern const u8 gTrainerBackPic_RubySapphireMay[];
|
||||
|
||||
#endif //GUARD_GRAPHICS_H
|
||||
|
||||
+1
-2
@@ -382,9 +382,8 @@ SECTIONS {
|
||||
src/string_util.o(.rodata);
|
||||
src/link.o(.rodata);
|
||||
src/main_menu.o(.rodata);
|
||||
data/data.o(.rodata);
|
||||
src/data.o(.rodata);
|
||||
data/data.o(.rodata.82350AC);
|
||||
data/data.o(.rodata);
|
||||
src/battle_util.o(.rodata);
|
||||
src/battle_script_commands.o(.rodata);
|
||||
src/battle_controller_player.o(.rodata);
|
||||
|
||||
+262
@@ -9,4 +9,266 @@
|
||||
#include "constants/trainers.h"
|
||||
#include "constants/battle_ai.h"
|
||||
|
||||
const struct SpriteFrameImage gUnknown_8234698[] =
|
||||
{
|
||||
gHeap + 0x8000, 0x800,
|
||||
gHeap + 0x8800, 0x800,
|
||||
gHeap + 0x9000, 0x800,
|
||||
gHeap + 0x9800, 0x800,
|
||||
};
|
||||
|
||||
const struct SpriteFrameImage gUnknown_82346B8[] =
|
||||
{
|
||||
gHeap + 0xA000, 0x800,
|
||||
gHeap + 0xA800, 0x800,
|
||||
gHeap + 0xB000, 0x800,
|
||||
gHeap + 0xB800, 0x800,
|
||||
};
|
||||
|
||||
const struct SpriteFrameImage gUnknown_82346D8[] =
|
||||
{
|
||||
gHeap + 0xC000, 0x800,
|
||||
gHeap + 0xC800, 0x800,
|
||||
gHeap + 0xD000, 0x800,
|
||||
gHeap + 0xD800, 0x800,
|
||||
};
|
||||
|
||||
const struct SpriteFrameImage gUnknown_82346F8[] =
|
||||
{
|
||||
gHeap + 0xE000, 0x800,
|
||||
gHeap + 0xE800, 0x800,
|
||||
gHeap + 0xF000, 0x800,
|
||||
gHeap + 0xF800, 0x800,
|
||||
};
|
||||
|
||||
const struct SpriteFrameImage gTrainerBackPicTable_Red[] =
|
||||
{
|
||||
gTrainerBackPic_Red, 0x0800,
|
||||
gTrainerBackPic_Red + 0x0800, 0x0800,
|
||||
gTrainerBackPic_Red + 0x1000, 0x0800,
|
||||
gTrainerBackPic_Red + 0x1800, 0x0800,
|
||||
gTrainerBackPic_Red + 0x2000, 0x0800,
|
||||
};
|
||||
|
||||
const struct SpriteFrameImage gTrainerBackPicTable_Leaf[] =
|
||||
{
|
||||
gTrainerBackPic_Leaf, 0x0800,
|
||||
gTrainerBackPic_Leaf + 0x0800, 0x0800,
|
||||
gTrainerBackPic_Leaf + 0x1000, 0x0800,
|
||||
gTrainerBackPic_Leaf + 0x1800, 0x0800,
|
||||
gTrainerBackPic_Leaf + 0x2000, 0x0800,
|
||||
};
|
||||
|
||||
const struct SpriteFrameImage gTrainerBackPicTable_PokeDude[] =
|
||||
{
|
||||
gTrainerBackPic_PokeDude, 0x0800,
|
||||
gTrainerBackPic_PokeDude + 0x0800, 0x0800,
|
||||
gTrainerBackPic_PokeDude + 0x1000, 0x0800,
|
||||
gTrainerBackPic_PokeDude + 0x1800, 0x0800,
|
||||
};
|
||||
|
||||
const struct SpriteFrameImage gTrainerBackPicTable_OldMan[] =
|
||||
{
|
||||
gTrainerBackPic_OldMan, 0x0800,
|
||||
gTrainerBackPic_OldMan + 0x0800, 0x0800,
|
||||
gTrainerBackPic_OldMan + 0x1000, 0x0800,
|
||||
gTrainerBackPic_OldMan + 0x1800, 0x0800,
|
||||
};
|
||||
|
||||
const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireBrendan[] =
|
||||
{
|
||||
gTrainerBackPic_RubySapphireBrendan, 0x0800,
|
||||
gTrainerBackPic_RubySapphireBrendan + 0x0800, 0x0800,
|
||||
gTrainerBackPic_RubySapphireBrendan + 0x1000, 0x0800,
|
||||
gTrainerBackPic_RubySapphireBrendan + 0x1800, 0x0800,
|
||||
};
|
||||
|
||||
const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireMay[] =
|
||||
{
|
||||
gTrainerBackPic_RubySapphireMay, 0x0800,
|
||||
gTrainerBackPic_RubySapphireMay + 0x0800, 0x0800,
|
||||
gTrainerBackPic_RubySapphireMay + 0x1000, 0x0800,
|
||||
gTrainerBackPic_RubySapphireMay + 0x1800, 0x0800,
|
||||
};
|
||||
|
||||
static const union AnimCmd sAnim_GeneralFrame0[] =
|
||||
{
|
||||
ANIMCMD_FRAME(0, 0),
|
||||
ANIMCMD_END,
|
||||
};
|
||||
|
||||
static const union AnimCmd sAnim_GeneralFrame3[] =
|
||||
{
|
||||
ANIMCMD_FRAME(3, 0),
|
||||
ANIMCMD_END,
|
||||
};
|
||||
|
||||
static const union AffineAnimCmd gSpriteAffineAnim_82347F8[] =
|
||||
{
|
||||
AFFINEANIMCMD_FRAME(0x0100, 0x0100, 0x00, 0x00),
|
||||
AFFINEANIMCMD_END,
|
||||
};
|
||||
|
||||
static const union AffineAnimCmd gSpriteAffineAnim_8234808[] =
|
||||
{
|
||||
AFFINEANIMCMD_FRAME(0xff00, 0x0100, 0x00, 0x00),
|
||||
AFFINEANIMCMD_END,
|
||||
};
|
||||
|
||||
static const union AffineAnimCmd gSpriteAffineAnim_8234818[] =
|
||||
{
|
||||
AFFINEANIMCMD_FRAME(0x0028, 0x0028, 0x00, 0x00),
|
||||
AFFINEANIMCMD_FRAME(0x0012, 0x0012, 0x00, 0x0c),
|
||||
AFFINEANIMCMD_END,
|
||||
};
|
||||
|
||||
static const union AffineAnimCmd gSpriteAffineAnim_8234830[] =
|
||||
{
|
||||
AFFINEANIMCMD_FRAME(0xfffe, 0xfffe, 0x00, 0x12),
|
||||
AFFINEANIMCMD_FRAME(0xfff0, 0xfff0, 0x00, 0x0f),
|
||||
AFFINEANIMCMD_END,
|
||||
};
|
||||
|
||||
static const union AffineAnimCmd gSpriteAffineAnim_8234848[] =
|
||||
{
|
||||
AFFINEANIMCMD_FRAME(0x00a0, 0x0100, 0x00, 0x00),
|
||||
AFFINEANIMCMD_FRAME(0x0004, 0x0000, 0x00, 0x08),
|
||||
AFFINEANIMCMD_FRAME(0xfffc, 0x0000, 0x00, 0x08),
|
||||
AFFINEANIMCMD_JUMP(1),
|
||||
};
|
||||
|
||||
static const union AffineAnimCmd gSpriteAffineAnim_8234868[] =
|
||||
{
|
||||
AFFINEANIMCMD_FRAME(0x0002, 0x0002, 0x00, 0x14),
|
||||
AFFINEANIMCMD_END,
|
||||
};
|
||||
|
||||
static const union AffineAnimCmd gSpriteAffineAnim_8234878[] =
|
||||
{
|
||||
AFFINEANIMCMD_FRAME(0xfffe, 0xfffe, 0x00, 0x14),
|
||||
AFFINEANIMCMD_END,
|
||||
};
|
||||
|
||||
static const union AffineAnimCmd gSpriteAffineAnim_8234888[] =
|
||||
{
|
||||
AFFINEANIMCMD_FRAME(0x0100, 0x0100, 0x00, 0000),
|
||||
AFFINEANIMCMD_FRAME(0xfff0, 0xfff0, 0x00, 0x09),
|
||||
AFFINEANIMCMD_END,
|
||||
};
|
||||
|
||||
static const union AffineAnimCmd gSpriteAffineAnim_82348A0[] =
|
||||
{
|
||||
AFFINEANIMCMD_FRAME(0x0004, 0x0004, 0x00, 0x3f),
|
||||
AFFINEANIMCMD_END,
|
||||
};
|
||||
|
||||
static const union AffineAnimCmd gSpriteAffineAnim_82348B0[] =
|
||||
{
|
||||
AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0xfd, 0x05),
|
||||
AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x03, 0x05),
|
||||
AFFINEANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AffineAnimCmd *const gSpriteAffineAnimTable_82348C8[] =
|
||||
{
|
||||
gSpriteAffineAnim_82347F8,
|
||||
gSpriteAffineAnim_8234818,
|
||||
gSpriteAffineAnim_8234830,
|
||||
gSpriteAffineAnim_8234848,
|
||||
gSpriteAffineAnim_8234868,
|
||||
gSpriteAffineAnim_8234878,
|
||||
gSpriteAffineAnim_82348A0,
|
||||
gSpriteAffineAnim_82348B0,
|
||||
gSpriteAffineAnim_8234888,
|
||||
};
|
||||
|
||||
static const union AffineAnimCmd gSpriteAffineAnim_82348EC[] =
|
||||
{
|
||||
AFFINEANIMCMD_FRAME(0xfffc, 0xfffc, 0x04, 0x3f),
|
||||
AFFINEANIMCMD_END,
|
||||
};
|
||||
|
||||
static const union AffineAnimCmd gSpriteAffineAnim_82348FC[] =
|
||||
{
|
||||
AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x03, 0x05),
|
||||
AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0xfd, 0x05),
|
||||
AFFINEANIMCMD_END,
|
||||
};
|
||||
|
||||
static const union AffineAnimCmd gSpriteAffineAnim_8234914[] =
|
||||
{
|
||||
AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0xfb, 0x14),
|
||||
AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x00, 0x14),
|
||||
AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x05, 0x14),
|
||||
AFFINEANIMCMD_END,
|
||||
};
|
||||
|
||||
static const union AffineAnimCmd gSpriteAffineAnim_8234934[] =
|
||||
{
|
||||
AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x09, 0x6e),
|
||||
AFFINEANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AffineAnimCmd *const gSpriteAffineAnimTable_8234944[] =
|
||||
{
|
||||
gSpriteAffineAnim_82347F8,
|
||||
gSpriteAffineAnim_8234818,
|
||||
gSpriteAffineAnim_8234830,
|
||||
gSpriteAffineAnim_8234848,
|
||||
gSpriteAffineAnim_8234868,
|
||||
gSpriteAffineAnim_8234878,
|
||||
gSpriteAffineAnim_82348EC,
|
||||
gSpriteAffineAnim_82348FC,
|
||||
gSpriteAffineAnim_8234914,
|
||||
gSpriteAffineAnim_8234888,
|
||||
gSpriteAffineAnim_8234934,
|
||||
};
|
||||
|
||||
const union AffineAnimCmd *const gSpriteAffineAnimTable_82349470[] =
|
||||
{
|
||||
gSpriteAffineAnim_8234808,
|
||||
gSpriteAffineAnim_8234818,
|
||||
gSpriteAffineAnim_8234830,
|
||||
gSpriteAffineAnim_8234848,
|
||||
gSpriteAffineAnim_8234868,
|
||||
gSpriteAffineAnim_8234878,
|
||||
gSpriteAffineAnim_82348EC,
|
||||
gSpriteAffineAnim_82348FC,
|
||||
gSpriteAffineAnim_8234914,
|
||||
gSpriteAffineAnim_8234888,
|
||||
gSpriteAffineAnim_8234934,
|
||||
};
|
||||
|
||||
static const union AnimCmd gSpriteAnim_823499C[] =
|
||||
{
|
||||
ANIMCMD_FRAME(0, 0),
|
||||
ANIMCMD_END,
|
||||
};
|
||||
|
||||
static const union AnimCmd gSpriteAnim_82349A4[] =
|
||||
{
|
||||
ANIMCMD_FRAME(1, 0),
|
||||
ANIMCMD_END,
|
||||
};
|
||||
|
||||
static const union AnimCmd gSpriteAnim_82349AC[] =
|
||||
{
|
||||
ANIMCMD_FRAME(2, 0),
|
||||
ANIMCMD_END,
|
||||
};
|
||||
|
||||
static const union AnimCmd gSpriteAnim_82349B4[] =
|
||||
{
|
||||
ANIMCMD_FRAME(3, 0),
|
||||
ANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AnimCmd *const gSpriteAnimTable_82349BC[] =
|
||||
{
|
||||
gSpriteAnim_823499C,
|
||||
gSpriteAnim_82349A4,
|
||||
gSpriteAnim_82349AC,
|
||||
gSpriteAnim_82349B4,
|
||||
};
|
||||
|
||||
#include "data/pokemon_graphics/front_pic_coordinates.h"
|
||||
|
||||
+6
-6
@@ -1509,7 +1509,7 @@ const struct SpriteTemplate gUnknown_825DF50[] =
|
||||
.paletteTag = 0,
|
||||
.oam = &gUnknown_824F018,
|
||||
.anims = NULL,
|
||||
.images = gUnknown_8234718,
|
||||
.images = gTrainerBackPicTable_Red,
|
||||
.affineAnims = gSpriteAffineAnimTable_82348C8,
|
||||
.callback = sub_80120C4,
|
||||
},
|
||||
@@ -1518,7 +1518,7 @@ const struct SpriteTemplate gUnknown_825DF50[] =
|
||||
.paletteTag = 0,
|
||||
.oam = &gUnknown_824F018,
|
||||
.anims = NULL,
|
||||
.images = gUnknown_8234740,
|
||||
.images = gTrainerBackPicTable_Leaf,
|
||||
.affineAnims = gSpriteAffineAnimTable_82348C8,
|
||||
.callback = sub_80120C4,
|
||||
},
|
||||
@@ -1527,7 +1527,7 @@ const struct SpriteTemplate gUnknown_825DF50[] =
|
||||
.paletteTag = 0,
|
||||
.oam = &gUnknown_824F018,
|
||||
.anims = NULL,
|
||||
.images = gUnknown_82347A8,
|
||||
.images = gTrainerBackPicTable_RubySapphireBrendan,
|
||||
.affineAnims = gSpriteAffineAnimTable_82348C8,
|
||||
.callback = sub_80120C4,
|
||||
},
|
||||
@@ -1536,7 +1536,7 @@ const struct SpriteTemplate gUnknown_825DF50[] =
|
||||
.paletteTag = 0,
|
||||
.oam = &gUnknown_824F018,
|
||||
.anims = NULL,
|
||||
.images = gUnknown_82347C8,
|
||||
.images = gTrainerBackPicTable_RubySapphireMay,
|
||||
.affineAnims = gSpriteAffineAnimTable_82348C8,
|
||||
.callback = sub_80120C4,
|
||||
},
|
||||
@@ -1545,7 +1545,7 @@ const struct SpriteTemplate gUnknown_825DF50[] =
|
||||
.paletteTag = 0,
|
||||
.oam = &gUnknown_824F018,
|
||||
.anims = NULL,
|
||||
.images = gUnknown_8234768,
|
||||
.images = gTrainerBackPicTable_PokeDude,
|
||||
.affineAnims = gSpriteAffineAnimTable_82348C8,
|
||||
.callback = sub_80120C4,
|
||||
},
|
||||
@@ -1554,7 +1554,7 @@ const struct SpriteTemplate gUnknown_825DF50[] =
|
||||
.paletteTag = 0,
|
||||
.oam = &gUnknown_824F018,
|
||||
.anims = NULL,
|
||||
.images = gUnknown_8234788,
|
||||
.images = gTrainerBackPicTable_OldMan,
|
||||
.affineAnims = gSpriteAffineAnimTable_82348C8,
|
||||
.callback = sub_80120C4,
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user